tomahawk-player/tomahawk — pull request #285 by justin-time (2014-12-23 10:59:34+00:00)
Title: fix structure bug

This should fix TWK-1837 and TWK-1963.