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

Conflicts:
	core/lib/Thelia/Core/Template/Element/BaseLoop.php

2013-07-09 11:45:01 +02:00

..

Thelia

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

2013-07-09 11:45:01 +02:00