Merge branch 'upstream'
authorJérôme Benoit <jerome.benoit@piment-noir.org>
Wed, 26 Nov 2014 00:06:58 +0000 (01:06 +0100)
committerJérôme Benoit <jerome.benoit@piment-noir.org>
Wed, 26 Nov 2014 00:06:58 +0000 (01:06 +0100)

Trivial merge