Conflicts:
	component/pcre/buildout.cfg
	setup.py

In addition to be useless, this assigment mess
up the options dict. This was adding a bad
connection parameter in publish recipe.

This merge introduce a shellinabox service on every test node.

This merge also switches testnode to generic recipes way.
It changes a bit the syntax of requesting a test node, but I
updated documentation about testnode.

This is the work I did during my internship in order
to implement backup and wordpress with a pseudo-replicating
MariaDB ready to be used.

This branch name stands for 'WordPress Ready To Use BACKUP'.

This work will be cleaned up, and improved by merging
skynet branch.

Conflicts:
	setup.py
	slapos/recipe/davstorage/__init__.py
	software/wordpress/software.cfg

Conflicts:
	component/git/buildout.cfg
	component/openssl/buildout.cfg
	setup.py

Currently ERP5 develops more.

Conflicts:
	slapos/recipe/erp5/__init__.py

Conflicts:
	component/slapos/buildout.cfg

Conflicts:
	component/apache-php/buildout.cfg

Master version of component/apache-php/buildout.cfg has been kept, as it
provides same functionality but in more updated way.

Conflicts:
	software/erp5/software.cfg
	software/erp5testnode/software.cfg

Both files reverted back to master.

Conflicts:
	software/erp5/software.cfg
	software/erp5testnode/software.cfg

Both files reverted back to master.

Conflicts:
	software/erp5/software.cfg
	software/erp5testnode/software.cfg

Both files reverted back to master.

Conflicts:
	software/erp5/software.cfg
	software/erp5testnode/software.cfg

Both files reverted back to master.

Conflicts:
	software/erp5/software.cfg
	software/erp5testnode/software.cfg

Both files reverted back to master.

Conflicts:
	software/erp5/software.cfg
	software/erp5testnode/software.cfg

Both files reverted back to master.