]> git.ipfire.org Git - thirdparty/shairport-sync.git/commitdiff
Merging upstream
authormike <mike@qtunes.org>
Wed, 27 Apr 2016 09:27:21 +0000 (10:27 +0100)
committermike <mike@qtunes.org>
Wed, 27 Apr 2016 09:27:21 +0000 (10:27 +0100)
Merge remote-tracking branch 'upstream/development' into development


Trivial merge