Merge branch 'maint'
commit4a40c215f996498d6a42dd1a25f1d268e1c17351
authorBastien Guerry <bzg@altern.org>
Tue, 26 Feb 2013 22:17:42 +0000 (26 23:17 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 26 Feb 2013 22:17:42 +0000 (26 23:17 +0100)
treedaa6de5d7715f5e87edabb0e3b27e5a6615c535a
parent78c4199310929fed0355eb8079ba2b1ce9503667
parentc30ba6f15690e1a5441ade39203229ff232f6be1
Merge branch 'maint'