Aaron Cohen 86f51dcbdb Merge remote-tracking branch 'origin/master' into what-search ...

Conflicts:
	headphones/webserve.py

2012-09-10 20:53:28 -07:00

..

brink

fixed typo in footer

2012-07-27 19:14:28 +03:00

classic

Bug fixes, moved delete from newartists to the artistlist_to_mbids function, don't check if blacklisted

2012-07-13 16:28:53 +05:30

default

Merge remote-tracking branch 'origin/master' into what-search

2012-09-10 20:53:28 -07:00

remix

Bug fixes, moved delete from newartists to the artistlist_to_mbids function, don't check if blacklisted

2012-07-13 16:28:53 +05:30