Merge branch '2.0-scrobble' into clean-2.0-scrobble
authorJonas Haraldsson <jonas227@gmail.com>
Sun, 7 Apr 2013 16:00:29 +0000 (18:00 +0200)
committerJonas Haraldsson <jonas227@gmail.com>
Sun, 7 Apr 2013 16:00:29 +0000 (18:00 +0200)
commita22bf3ba827239ce15880c81aa56c92e75ac8635
tree0a386eaddf91c7431b90b1b7cc7a2f63e1470178
parentef4806e269b20536ad96f42e1a7ebb2e7483c0b3
parent9be98cb1c4bc87f806aaed0c594829f2fbbb4fd1
Merge branch '2.0-scrobble' into clean-2.0-scrobble

Conflicts resolved:
nixtape/api/TrackXML.php
nixtape/2.0/index.php
nixtape/api/TrackXML.php
nixtape/data/Server.php