Merge branch 'master' into erp5-component
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 27 Jun 2012 08:28:21 +0000 (10:28 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 27 Jun 2012 08:28:21 +0000 (10:28 +0200)
commit321fcea03d5ee4357b58d3926d796c85e2b07f5e
tree5f2e8f54c4bb93fdd21b2c923882d5f70026917a
parent07e800c1068826c2e8d2cd6d7c9d4f2c5dee609c
parent9ad3696806e54d72ac7b0a7bda15a7eca3877027
Merge branch 'master' into erp5-component

Conflicts:
component/apache-php/buildout.cfg
component/git/buildout.cfg
component/mariadb/buildout.cfg
slapos/recipe/request.py
software/drupal/instance.cfg
stack/lamp/buildout.cfg
stack/nbd.cfg
component/apache-php/buildout.cfg
component/apache/buildout.cfg
setup.py
slapos/recipe/librecipe/generic.py
slapos/recipe/request.py
stack/lamp/instance-mariadb.cfg