Merge branch 'master' of gitorious.org:qtmediahub/flunder
authorMarcel Schuette <marcel.schuette@nokia.com>
Wed, 31 Aug 2011 23:29:03 +0000 (01:29 +0200)
committerMarcel Schuette <marcel.schuette@nokia.com>
Wed, 31 Aug 2011 23:29:03 +0000 (01:29 +0200)
commit99db63e6997b6dd05aa3e3a3024457e9ef88ee26
treea912af15a7f1ff233ad1e2df7f7aa020679ca617
parent87de7700c73f89e7e834d1563763bf90c69694fb
parent29d6d21131e04b04cff58b7d93dd18063f38f3b8
Merge branch 'master' of gitorious.org:qtmediahub/flunder