Merge branch 'maint'
commita29de08ff7c730f7aba3a66a1e361ca0a74fe23c
authorBastien Guerry <bzg@altern.org>
Fri, 26 Oct 2012 13:59:10 +0000 (26 15:59 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 26 Oct 2012 13:59:10 +0000 (26 15:59 +0200)
tree9ed6504f5e73e849e87ae3c9fc2dd8910b3d24ee
parent8866f86624b0737e3f9052be7582b51330e2365b
parentacbbe2d5b28968c692b7385b8446092c2c21fc3a
Merge branch 'maint'