Merge branch 'maint'
commit365b9dde16f3f0863dbfd09a57a3bbed552a33be
authorBastien Guerry <bzg@altern.org>
Thu, 22 May 2014 14:10:19 +0000 (22 16:10 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 22 May 2014 14:10:19 +0000 (22 16:10 +0200)
treec0551acc7536e4e9baf33d6762df30f079a3f706
parenta7b7c3de2b2a563cd20dfa17c891c3b1a7f2c21f
parent7d3b3997d3d67c3ef0834e45266dec1fa12cad5d
Merge branch 'maint'