Merge branch 'maint'
commit275f07c16aa67b334eb0b86a0ac131f2091bb1c8
authorBastien Guerry <bzg@altern.org>
Wed, 12 Dec 2012 12:53:37 +0000 (12 13:53 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 12 Dec 2012 12:53:37 +0000 (12 13:53 +0100)
treee2f20a6feb85078780b568e476622bcdaa9db258
parent47ea16660eec6e773806165db57ac7db035914f8
parent488eea6d256ab4060ac92423536cee9d153e0263
Merge branch 'maint'