Merge branch 'wordpress' slapos-0.75.2
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 28 Mar 2012 14:04:44 +0000 (16:04 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 28 Mar 2012 14:04:44 +0000 (16:04 +0200)
commit28cf6c45b497513eb4d93178a21810d737b7ad9d
tree21362c941935b0b3e7528faf5c04b2c6dfc75a34
parent46872d8c178e962c0db1b9db56cf1298e1917d66
parentdd0407ea69f12e1b7c1a1beb7e63876e9d959f53
Merge branch 'wordpress'