Merge branch 'kvm'. Lot of conflicts.
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 10 Nov 2011 15:18:29 +0000 (16:18 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 10 Nov 2011 15:18:29 +0000 (16:18 +0100)
commit156fdca49cb3597c4d9fdbc4b27ef4e3217d1537
treeb59101007916929e7db1083f95c36fa759d46c2a
parentda56db86b22dd60c2d0f58c3acb0ca9488e6c2fa
parentad01afca3ad74396928aa9572bca9a966f5db142
Merge branch 'kvm'. Lot of conflicts.

Some branch must have badly used squash commit. Maybe me.
I hate me.

Conflicts:
CHANGES.txt
component/apache-php/buildout.cfg
component/gcc/buildout.cfg
component/java/buildout.cfg
component/slapos/buildout.cfg
component/stunnel/buildout.cfg
setup.py
slapos/recipe/kvm/__init__.py
slapos/recipe/lamp/__init__.py
slapos/recipe/lamp/template/apache.in
slapos/recipe/lamp/template/php.ini.in
slapos/recipe/librecipe/__init__.py
slapos/recipe/mysql/__init__.py
software/davstorage/instance.cfg
software/davstorage/software.cfg
software/erp5/software.cfg
software/kvm/software.cfg
software/lamp-template/instance.cfg
software/lamp-template/software.cfg
software/mariadb/instance.cfg
software/mariadb/software.cfg
software/phpmyadmin/software.cfg
software/slaprunner/software.cfg
software/wordpress/instance.cfg
software/wordpress/software.cfg
slapos/recipe/kvm/__init__.py
software/kvm/software.cfg