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