Merge branch 'master' into harmattan
authorDennis Groenen <tj.groenen@gmail.com>
Fri, 30 Nov 2012 18:54:12 +0000 (19:54 +0100)
committerDennis Groenen <tj.groenen@gmail.com>
Fri, 30 Nov 2012 18:54:12 +0000 (19:54 +0100)
commit43c317675145576676a505385455f652e0948379
treecefec7529ec664a33cffb6c3e62f1a82e8f0541e
parent3d5baf37966f0da8fa7ef22ea571efdb241810ec
parentd65c7b3aa64a1e63e5a370dc4a08393004988bab
Merge branch 'master' into harmattan

Conflicts:
debian/changelog
debian/changelog
debian/control
debian/rules