franck a2d6c16d13 Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	templates/default/login.html

2013-08-30 19:48:26 +02:00

..

ModelCriteriaTools.php

Merge branch 'master' of https://github.com/thelia/thelia

2013-08-30 19:48:26 +02:00