Merge branch 'master' of git://git.musicpd.org/avuton/mpd
commitfcd2355f4f4053bfdda925de1807f601ea7506fb
authorMax Kellermann <max@duempel.org>
Tue, 7 Dec 2010 17:18:19 +0000 (7 18:18 +0100)
committerMax Kellermann <max@duempel.org>
Tue, 7 Dec 2010 17:18:19 +0000 (7 18:18 +0100)
treefef555e70790a2e1398db4095c821eab8a1a2053
parent748a8a6f42653a6aededa8769c7315176f0b916f
parentf2893b0d0fa388599b90b9858ca62602bdcf99f2
Merge branch 'master' of git://git.musicpd.org/avuton/mpd