actualizacion
actualizacion
Merge branch 'magento' of github.com:estrategasdigitales/cocoon into magento

Conflicts:
	app/design/frontend/textil1/textil/template/catalog/product/view.phtml
	app/design/frontend/textil1/textil/template/page/html/header.phtml