Merge branch 'upstream'
authorJérôme Benoit <jerome.benoit@piment-noir.org>
Mon, 1 Dec 2014 15:38:55 +0000 (16:38 +0100)
committerJérôme Benoit <jerome.benoit@piment-noir.org>
Mon, 1 Dec 2014 15:38:55 +0000 (16:38 +0100)
commit586d23f626cb0304c1dbf29eab7b4ecb70068bfc
treedf23e45a3b1483608cd49fd6ea1fab7bff6a671d
parentf6b9ea8678f340e580dff8b71c1c29322f901099
parent77c3ed69b67069cc65a0b8ffe889d612af33a56f
Merge branch 'upstream'