spl0k 2c41e1af64 Merge branch 'master' into storm ... Conflicts: bin/supysonic-cli supysonic/api/__init__.py supysonic/api/albums_songs.py supysonic/api/annotation.py supysonic/api/browse.py supysonic/api/chat.py supysonic/api/media.py supysonic/api/playlists.py supysonic/api/search.py supysonic/api/user.py supysonic/db.py supysonic/frontend/__init__.py supysonic/frontend/folder.py supysonic/frontend/playlist.py supysonic/frontend/user.py supysonic/lastfm.py supysonic/managers/folder.py supysonic/managers/user.py supysonic/scanner.py supysonic/web.py		2014-06-14 17:55:52 +02:00
..
supysonic-cli	Merge branch 'master' into storm	2014-06-14 17:55:52 +02:00