Merge branch 'development' master
authorLuciano Montanaro <mikelima@cirulla.net>
Sat, 4 Jan 2014 15:45:19 +0000 (16:45 +0100)
committerLuciano Montanaro <mikelima@cirulla.net>
Sat, 4 Jan 2014 15:45:19 +0000 (16:45 +0100)

Trivial merge