Merge branch 'wordpress'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 15 May 2012 15:24:55 +0000 (17:24 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 15 May 2012 15:24:55 +0000 (17:24 +0200)
commitedbebe137eeb00dd1de9359be61a620c7e890966
treed52c2ea26a23a6191e074d0141063c335c2e22e9
parentd2b26b50b776085e7eefe75c18cd91dad878f44b
parent1a30a41bb2cd19702d830be50c399231cb35e016
Merge branch 'wordpress'