franck 0719c8b740 Merge branch 'admin' of https://github.com/thelia/thelia into admin ...

Conflicts:
	core/lib/Thelia/Admin/Templating/Template.class.php

2013-06-18 15:35:36 +02:00

..

Thelia

Merge branch 'admin' of https://github.com/thelia/thelia into admin

2013-06-18 15:35:36 +02:00