Merge branch 'upstream'
authorJérôme Benoit <jerome.benoit@piment-noir.org>
Mon, 1 Dec 2014 18:10:59 +0000 (19:10 +0100)
committerJérôme Benoit <jerome.benoit@piment-noir.org>
Mon, 1 Dec 2014 18:10:59 +0000 (19:10 +0100)

Trivial merge