1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-21 08:19:42 +01:00
Leo Franchi e5414c8ff6 Merge remote-tracking branch 'origin/master' into accounts
Conflicts:
	src/accounts/xmpp/sip/xmppsip.cpp
	src/libtomahawk/CMakeLists.txt
2012-01-29 10:27:31 -05:00
..
2012-01-27 13:50:29 -05:00
2011-11-28 13:17:27 -05:00
2011-11-24 06:33:04 +01:00
2011-11-20 22:39:00 -05:00
2012-01-29 10:07:15 -05:00