Merged
authorSébastien Grignard <seb@amakaze.org>
Thu, 2 Jan 2014 19:07:52 +0000 (20:07 +0100)
committerSébastien Grignard <seb@amakaze.org>
Thu, 2 Jan 2014 19:07:52 +0000 (20:07 +0100)

Trivial merge