Merge remote-tracking branch 'origin/wordpress' slapos-0.123
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 18 Sep 2012 08:35:44 +0000 (10:35 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 18 Sep 2012 08:35:44 +0000 (10:35 +0200)
commit8ee54da709ffae98c64869de5952a9a2650aa973
tree03ed1cc900e675357c0fae08723b67aa87946f29
parent6e3ff57b93d3f0d73214e2d9617faf4c517c703d
parentb3cce13c1f1fdd2677f53754b275ecb99c6b2f63
Merge remote-tracking branch 'origin/wordpress'