Merge branch 'development' for tagging of 0.7.0 0.7.0
authorLuciano Montanaro <mikelima@cirulla.net>
Fri, 27 Dec 2013 14:39:01 +0000 (15:39 +0100)
committerLuciano Montanaro <mikelima@cirulla.net>
Fri, 27 Dec 2013 14:39:01 +0000 (15:39 +0100)

Trivial merge