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)
commit323d5faa1fcd6657899dabfed2e4ad455c92f5c4
tree7320f333b48cc2ecd7b3851721dbd3784d7ea85e
parent1a2d113fd62f1f8b362f907c0fd34c2adecdb1f1
parente90877c392971112636cf28d521d1fd525824009
Merge branch 'release-1.0.x'

The commits have already been cherry-picked but this commit makes it clear.