Merge commit 'refs/merge-requests/2031' of git://gitorious.org/amarok/amarok into...
authorMark Kretschmann <kretschmann@kde.org>
Thu, 19 Nov 2009 07:51:17 +0000 (08:51 +0100)
committerMark Kretschmann <kretschmann@kde.org>
Thu, 19 Nov 2009 07:51:17 +0000 (08:51 +0100)
commit5f0a031847700e62a476bce3ac85a8251b017df2
treed115d2b72ab63af1f971023c5a19010db5cb995b
parent0bc45b21f7792ad610ceb2d1afd0a63f69f91b10
parent8e88941148d8f2a6e6154057e45bf2690f037034
Merge commit 'refs/merge-requests/2031' of git://gitorious.org/amarok/amarok into integration
src/playlist/proxymodels/GroupingProxy.cpp