Merge branch 'sailfish-port' tags/0.6.1
authorLuciano Montanaro <mikelima@cirulla.net>
Wed, 13 Nov 2013 00:09:26 +0000 (01:09 +0100)
committerLuciano Montanaro <mikelima@cirulla.net>
Wed, 13 Nov 2013 00:09:26 +0000 (01:09 +0100)
Prepare for version 0.6.1


Trivial merge