Merge branch 'master' of git://repo.or.cz/pyTivo/wmcbrine
commitbc0f2b6cc3bc79450732d1600cdbe11b83b0adbe
authorwgw <tjm1100@gmail.com>
Fri, 7 Mar 2008 02:03:22 +0000 (6 20:03 -0600)
committerwgw <tjm1100@gmail.com>
Fri, 7 Mar 2008 02:03:22 +0000 (6 20:03 -0600)
tree2c8c8d8585d3f946e5b201b4eaaa0937a30b8899
parent4dcb0e0db92c780255577d9a91195c64c781d6b8
parentdbcc17c9e1e9e6218f1203d7f443bb1c0b3dd154
Merge branch 'master' of git://repo.or.cz/pyTivo/wmcbrine
plugins/music/music.py