Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 9 Jan 2013 13:11:12 +0000 (14:11 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 9 Jan 2013 13:11:12 +0000 (14:11 +0100)

Trivial merge