[MERGE] from master
authorFrédéric van der Essen <fvdessen@gmail.com>
Tue, 9 Dec 2014 22:38:33 +0000 (23:38 +0100)
committerFrédéric van der Essen <fvdessen@gmail.com>
Tue, 9 Dec 2014 22:38:33 +0000 (23:38 +0100)

No differences found