Merge tag 'v2.1.4' into debian-sid
commit48a41c002e31bc5b2b2030dd36f8007d97fcbb7b
authorJonathan Nieder <jrnieder@gmail.com>
Fri, 19 Dec 2014 23:15:59 +0000 (19 15:15 -0800)
committerJonathan Nieder <jrnieder@gmail.com>
Fri, 19 Dec 2014 23:15:59 +0000 (19 15:15 -0800)
treec018eef04866560e7740f138bc6b01854c3ae560
parent95a669164ea995d139ae5d6ad4be50796ce2eb0d
parent8e36a6d5752ced382ecd46a5f2cd94276f79451c
Merge tag 'v2.1.4' into debian-sid

Git 2.1.4