Merge branch 'maint'
commit13092befb6ec2a1848be15c405c8494fb949771b
authorBastien Guerry <bzg@altern.org>
Wed, 26 Sep 2012 13:19:04 +0000 (26 15:19 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 26 Sep 2012 13:19:04 +0000 (26 15:19 +0200)
tree105268851286c40855d4ed351dc1d3a92ea93e9e
parent8365b738ee0a647dc32856eaada9eb636ab0b0b3
parentc1b6920568791989b58ee599291a7fa33c9f1cbf
Merge branch 'maint'