Merge release branch '1.0.x'
authorFrançois Bobot <francois@bobot.eu>
Fri, 7 Dec 2012 08:35:38 +0000 (09:35 +0100)
committerFrançois Bobot <francois@bobot.eu>
Fri, 7 Dec 2012 08:35:38 +0000 (09:35 +0100)
For clarity 1.0.x is always a subset of master even after cherry-picking


Trivial merge