Merge branch 'master' of /home/git/repositories/nico/ympd
authorAndy <andy@ndyk.de>
Sun, 12 Jan 2014 18:51:07 +0000 (19:51 +0100)
committerAndy <andy@ndyk.de>
Sun, 12 Jan 2014 18:51:07 +0000 (19:51 +0100)

Trivial merge