Merge branch 'upstream'
authorJérôme Benoit <jerome.benoit@piment-noir.org>
Wed, 26 Nov 2014 00:58:03 +0000 (01:58 +0100)
committerJérôme Benoit <jerome.benoit@piment-noir.org>
Wed, 26 Nov 2014 00:58:03 +0000 (01:58 +0100)
commit880005f7a156e9812d8f32919a37d7ba51bb952f
treee7b4bbf97f51e061db8bfdb59fb21c5c763b30a1
parente11d53a834240787ecff395da0b573358b0aa584
parent8261a84615c07c18c16ade2a78f8ad8b67c38cd7
Merge branch 'upstream'

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
Conflicts:
configure