touffies 9d5aa5e077 Merge branch 'master' into frontend ...

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

2013-10-22 11:55:58 +02:00

..

Thelia

Merge branch 'master' into frontend

2013-10-22 11:55:58 +02:00