Merge branch 'master' of git://github.com/notandy/ympd into notandy-master
authorSuperBFG7 <daniel@despite.ch>
Sun, 14 Feb 2016 11:33:57 +0000 (12:33 +0100)
committerSuperBFG7 <daniel@despite.ch>
Sun, 14 Feb 2016 11:33:57 +0000 (12:33 +0100)

Trivial merge