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

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	templates/admin/default/admin-layout.tpl

2013-09-12 13:04:12 +02:00

..

default

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

2013-09-12 13:04:12 +02:00