GitLab

This is a squash of the following :

Merging Alain's work in erp5 repo.

This is a squash of the following commits :

commit 8fb794464a2bdd0a7c4cc9e44636cf376a871e65
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Wed Sep 28 12:11:40 2011 +0100

    Remove kwrite backup file.

commit 13feffcd5da2d4cefa7ace8c6a09859a16c77ac5
Author: Antoine Catton <acatton@tiolive.con>
Date:   Wed Sep 28 12:10:09 2011 +0100

    Remove rdiff-backup from mariadb software.

    The merge should not have do that.

commit b8fcd02b83f061e803c285d8a157a4041a92ec54
Merge: 54a76ad8 5b009b8
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Wed Sep 28 11:59:45 2011 +0100

    Merge branch Alain's fork with erp5 repo

    Conflicts:
    	CHANGES.txt
    	component/apache-php/buildout.cfg
    	setup.py
    	slapos/recipe/davstorage/__init__.py
    	slapos/recipe/lamp/template/php.ini.in
    	slapos/recipe/librecipe/__init__.py
    	slapos/recipe/mysql/__init__.py
    	software/davstorage/so...