Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 8 Sep 2013 21:53:16 +0000 (8 23:53 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 8 Sep 2013 21:53:16 +0000 (8 23:53 +0200)

Trivial merge