Merge branch 'maint'
commit50fe7cc631ee6e6b197c7b2faf48513a967d9d66
authorBastien Guerry <bzg@altern.org>
Wed, 3 Oct 2012 09:33:37 +0000 (3 11:33 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 3 Oct 2012 09:33:37 +0000 (3 11:33 +0200)
tree1fcff4f9686555dc2121070fb65c128d36c754b2
parent83dbbfed280218b1d7e0623f018cb82e0f74e978
parent240432e66d7903371a5f96ee7785c167dc9a9353
Merge branch 'maint'