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

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Template.php

2013-11-06 11:16:27 +01:00

..

default

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

2013-11-06 11:16:27 +01:00