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)
commitaaf0290d2e892ed2edb16441495094abb45e6fa6
tree217822a5204eaa751d70ae4ef1d936d988bf9c44
parentaab90761cc68dfa33e13187e212eeea29a8da4fd
parentfb43099dce2e0f62bb663a5f4a316510dc5dc4c7
Merge branch 'upstream'