From: Jérôme Benoit <jerome.benoit@piment-noir.org>
Date: Wed, 26 Nov 2014 00:58:03 +0000 (+0100)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/0.9.0-7_trusty~4
X-Git-Url: https://git.piment-noir.org/?p=deb_shairplay.git;a=commitdiff_plain;h=880005f7a156e9812d8f32919a37d7ba51bb952f

Merge branch 'upstream'

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

Conflicts:
	configure
---

880005f7a156e9812d8f32919a37d7ba51bb952f