Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Sat, 26 Jan 2013 12:40:26 +0000 (13:40 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 26 Jan 2013 12:40:26 +0000 (13:40 +0100)

Trivial merge