Merge branch 'feature-sailfishos-cleanup' into development 0.8.0
authorLuciano Montanaro <mikelima@cirulla.net>
Tue, 31 Dec 2013 17:10:29 +0000 (18:10 +0100)
committerLuciano Montanaro <mikelima@cirulla.net>
Tue, 31 Dec 2013 17:10:29 +0000 (18:10 +0100)

Trivial merge