Code

Merge branch 'master' of git://git.musicpd.org/mithi/ncmpc
authorMax Kellermann <max@duempel.org>
Sat, 3 Oct 2009 18:18:02 +0000 (20:18 +0200)
committerMax Kellermann <max@duempel.org>
Sat, 3 Oct 2009 18:18:02 +0000 (20:18 +0200)

Trivial merge