Merge branch 'master' of git://repo.or.cz/libmpd
commit48df04832aa5570384075c044f9c2b16001120a1
authorQball Cow <qball@sarine.nl>
Mon, 1 Dec 2008 20:00:23 +0000 (1 21:00 +0100)
committerQball Cow <qball@sarine.nl>
Mon, 1 Dec 2008 20:00:23 +0000 (1 21:00 +0100)
treecd9cfe21e32b58bf5fa96967c8af68fdfb8a1c6e
parentc68c68c686690a6d1cbd4d209342a2992e3e00cd
parent323d3742e56e2489798b8295d63b8a3bfc04a338
Merge branch 'master' of git://repo.or.cz/libmpd