OK
Merge branch 'master' of git.assembla.com:sodi

MERGE ALL
 New changes
Merge branch 'master' of git.assembla.com:sodi
Merge branch 'master' of git.assembla.com:sodi

Conflicts:
	CHANGELOG.txt

Enfin si Hassen
Merge branch 'master' of git.assembla.com:sodi

OK  * 2
Revert " New changes"

This reverts commit 85c24d6230b9b9796c3e16f119c098ca34f0198d.

OK * 3
c moi
Merge branch 'master' of git.assembla.com:sodi

Conflicts:
	CHANGELOG.txt
COMMIT NOW
amal
This is a test.
Merge branch 'master' of git.assembla.com:sodi
Merge branch 'master' of git.assembla.com:sodi

Conflicts:
	CHANGELOG.txt
add profile2 module
add entity module
add patch user.module