Merge.
authorCharles-François Natali <cf.natali@gmail.com>
Sat, 8 Feb 2014 21:55:13 +0000 (22:55 +0100)
committerCharles-François Natali <cf.natali@gmail.com>
Sat, 8 Feb 2014 21:55:13 +0000 (22:55 +0100)

Trivial merge