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)
commit6919bd96436c76739490309bc677acaa8c290ded
tree0a386eaddf91c7431b90b1b7cc7a2f63e1470178
parentd8868f5e6d9b2ea481150d94ced989fa0136ecaf
parent637f9128b4be9ba2a98c97a732a6e44f795787da
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