Manuel Raynaud 617a814f0f Merge branch 'admin' of github.com:thelia/thelia into admin ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml

2013-06-19 17:18:00 +02:00

..

Thelia

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

2013-06-19 17:18:00 +02:00