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

Conflicts:
	templates/admin/default/currencies.html

2013-09-05 23:30:50 +02:00

..

default

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

2013-09-05 23:30:50 +02:00