Emilien Macchi 613a2f0e64 Merge branch 'master' into bug/179/leseb ...

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>

Conflicts:
	manifests/database/sql.pp

2014-02-07 18:37:52 +01:00

..

nosql.pp

nosql: convert bind_ip to array

2014-02-06 17:45:56 +01:00

sql.pp

Merge branch 'master' into bug/179/leseb

2014-02-07 18:37:52 +01:00