Merge branch 'maint'
commit44ad106d691e5a2919fa098d1935c9ba45b88635
authorBastien Guerry <bzg@altern.org>
Thu, 25 Oct 2012 08:56:47 +0000 (25 10:56 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 25 Oct 2012 08:56:47 +0000 (25 10:56 +0200)
tree0c14abb97032abc8693598b69cb7ea90e0c3d1e3
parent5c171435ba38955a160d191640cd577425055b55
parentde7766f4b0f04d74a69e461b5aad4e07e91a20bc
Merge branch 'maint'