Merge branch 'master' into slapmonitor
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 18 Jun 2012 14:12:38 +0000 (16:12 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 18 Jun 2012 14:12:38 +0000 (16:12 +0200)
commit1049bbd05e28700ecc7b70b2e6434d91a0f467ff
tree46dce31e1a73ec02acc1a4b1ff061610619a9399
parentcae1e12e27ced82d62103a8002576bfed8b6d157
parent2f9873a21d7f4dbae4945c145d384ffd65355109
Merge branch 'master' into slapmonitor

Conflicts:
stack/lamp/buildout.cfg
stack/lamp/instance-apache-php.cfg
setup.py
stack/lamp/buildout.cfg
stack/lamp/instance-apache-php.cfg