Merged with master
authorSébastien Grignard <seb@amakaze.org>
Wed, 15 Jan 2014 22:02:44 +0000 (23:02 +0100)
committerSébastien Grignard <seb@amakaze.org>
Wed, 15 Jan 2014 22:02:44 +0000 (23:02 +0100)

Trivial merge