Merge branch 'mirall-kde'
authorKlaas Freitag <freitag@owncloud.com>
Fri, 20 Jul 2012 09:56:50 +0000 (11:56 +0200)
committerKlaas Freitag <freitag@owncloud.com>
Fri, 20 Jul 2012 09:56:50 +0000 (11:56 +0200)
commit2433b3572744bf0418031041145eab6ebaf0701b
tree8b7862275fcab2c5a401a66313f8c829fc42805d
parent75835c45a3381e9a11eb1fb592d5d6d1cd91ebbb
parentd225dd124b551b3377854197af3ba2e1c3e2329a
Merge branch 'mirall-kde'