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

Merge branch 'upstream'
---

e2e3f886d1d84f5ed217c1e9c09864f3e48ad2d1