Merge branch 'maint'
commitca842068bb68820b6e5c0362b4bea6eaf684173e
authorBastien <bzg@gnu.org>
Fri, 19 Feb 2016 07:39:28 +0000 (19 08:39 +0100)
committerBastien <bzg@gnu.org>
Fri, 19 Feb 2016 07:39:28 +0000 (19 08:39 +0100)
tree407fb849148ca40333c4d5eb693b270d7ff5dfeb
parenta4a6d65c4b0ea7be2ace941ab5c6beb654def917
parent9259de15ec46dbfec9d1c784532a39546cfaff82
Merge branch 'maint'