Merge branches 'master' and 'playlist'
[zukebox] / zukebox_server / setup.py
2009-05-14 Henry BilbyModifying the zukebox data structure