Conflicts:
	software/slaprunner/software.cfg

set GLIB_CFLAGS and GLIB_LIBS variables so that the initial compilation without having pkg-config works.
Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>

Java is not a software release.
This reverts commit 0bfef46b.

This reverts commit 1c8b2d80.

Requiremenets of slapos.cookbook are not installed correctly.

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