Merge branch 'master' into mutagen-branch
commit9c8da557f40597083064051465be8965644b5005
authorWilliam McBrine <wmcbrine@gmail.com>
Thu, 26 Feb 2009 15:20:17 +0000 (26 10:20 -0500)
committerWilliam McBrine <wmcbrine@gmail.com>
Thu, 26 Feb 2009 15:20:17 +0000 (26 10:20 -0500)
treefa6ee1fb2d66c08bc490bdc7172c50fbc83a72f3
parent594f599e1be66b1eb392fc024441f113caa364a7
parent5ffd2e7904a70559ad4b84aade55b41188a55e14
Merge branch 'master' into mutagen-branch
plugins/music/music.py