V 0.8.0: Merge branch 'development'
authorLuciano Montanaro <mikelima@cirulla.net>
Tue, 31 Dec 2013 17:16:48 +0000 (18:16 +0100)
committerLuciano Montanaro <mikelima@cirulla.net>
Tue, 31 Dec 2013 17:16:48 +0000 (18:16 +0100)

Trivial merge