commité par sahbia
Merge branch 'master' of git.assembla.com:sodi
sahbia

Conflicts:
	CHANGELOG.txt
Merge branch 'master' of git.assembla.com:sodi
Merge branch 'master' of git.assembla.com:sodi
sahbia
Conflicts:
	CHANGELOG.txt
Merge branch 'master' of git.assembla.com:sodi