Merge branch 'master' of ssh://drop.maemo.org/git/qwp
authoreduca33e <educa33e@gmail.com>
Tue, 1 Feb 2011 22:31:16 +0000 (23:31 +0100)
committereduca33e <educa33e@gmail.com>
Tue, 1 Feb 2011 22:31:16 +0000 (23:31 +0100)
Conflicts:
qml/qwp/content/Config.qml
qtc_packaging/debian_fremantle/changelog
qtc_packaging/debian_fremantle/control
qwp.pro.user


No differences found