Merge branch 'release-1.0.x'
authorFrançois Bobot <francois@bobot.eu>
Thu, 6 Dec 2012 12:28:53 +0000 (13:28 +0100)
committerFrançois Bobot <francois@bobot.eu>
Thu, 6 Dec 2012 12:28:53 +0000 (13:28 +0100)
The commits have already been cherry-picked but this commit makes it clear.


Trivial merge