akezeke/spotyxbmc2 — pull request #35 by neoflex (2012-05-05 22:55:00+00:00)
Title: Sensible merging with upstream

I finally took the time to try to resolve the merging issues to keep spotyXBMC2 up to date with master.
It seems to be working but I think it should be tested by others before integrating. There has been some changes on CSong, CAlbum, and others classes which had some consequences for spotify files.