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)
commitee50792314754c1ed7ef982877165d8b90c1b21d
tree2f07a1f9fe44e088c3a9edaa8d7a45212fc83245
parentf46ba71e78054af63b529eb3271952c55beba37e
parent5d0d0b56d1383f1ad4027d8e6dc739c12cacced8
Merge release branch '1.0.x'

For clarity 1.0.x is always a subset of master even after cherry-picking