Merge branch 'maint'
commit87419d87df811632871b01492aeab310f62e14c6
authorBastien Guerry <bzg@altern.org>
Fri, 9 May 2014 12:40:58 +0000 (9 14:40 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 9 May 2014 12:40:58 +0000 (9 14:40 +0200)
treed234253983b2b6ac7551f7845df7e01ab599a909
parenta993e2d5e8cf10ba0addf16eca981fedc081986c
parentaaae4a55ca34aa913010c0c70319a854f0988834
Merge branch 'maint'