relicat ?
Merge branch 'master' of git://github.com/Esysteme/glial

Conflicts:
	Glial/Sgbd/Sql/Sql.php