Merge branch 'upstream'
authorJérôme Benoit <jerome.benoit@piment-noir.org>
Mon, 1 Dec 2014 18:10:59 +0000 (19:10 +0100)
committerJérôme Benoit <jerome.benoit@piment-noir.org>
Mon, 1 Dec 2014 18:10:59 +0000 (19:10 +0100)
commit816d06fd09beb1a4ccbe2c97d2007b489366ab69
tree5a6ddd812d8ab98189b9a27d3df925d92091c32e
parent69386db2eb9172a34fa37d2821edb485a44f7dee
parent00e29b2c0b8b0e7885e724f732c0d259c1f8419f
Merge branch 'upstream'