Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Tue, 4 Dec 2012 14:24:43 +0000 (15:24 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 4 Dec 2012 14:24:43 +0000 (15:24 +0100)

Trivial merge