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

Merge branch 'upstream'
---

d3a662880cfc564403d7830e6da961371c9f73d5