Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 6 Nov 2013 15:26:49 +0000 (16:26 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 6 Nov 2013 15:26:49 +0000 (16:26 +0100)

Trivial merge