Merge branch 'upstream'
authorJérôme Benoit <jerome.benoit@piment-noir.org>
Wed, 26 Nov 2014 01:14:45 +0000 (02:14 +0100)
committerJérôme Benoit <jerome.benoit@piment-noir.org>
Wed, 26 Nov 2014 01:14:45 +0000 (02:14 +0100)
commitd3a662880cfc564403d7830e6da961371c9f73d5
treec228b3ad31e375c89d694f10ead0447f8e63d481
parent863b37e6c012c0af7a42d39fb900916968a26036
parente6a946b079e3ad746b9f67ea30688bd21bde498f
Merge branch 'upstream'