Merge branch 'wordpress' slapos-0.86
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 16 May 2012 17:09:27 +0000 (19:09 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 16 May 2012 17:09:27 +0000 (19:09 +0200)
commit821b20138bc418661a083948948e50f406e19740
tree55e30f44d9bee297c845f09017e86e3486cdbf8c
parent18640467356b27c3531cc139260582b5c142b246
parentefc3c317332568a9eb52839d3dfd65f549a0df17
Merge branch 'wordpress'