Merged changes to tomahawk.js in tomahawk-desktop