Merge branch 'trunk'
cleaned
Merge branch 'trunk'
wss
test
Última revisión
Limpieza Plugins
Merge branch 'trunk'
..
Merge branch 'master' of https://github.com/idaChile/comunidad-guiatv

Conflicts:
	wp-content/themes/comunidadtv/images/Thumbs.db
	wp-content/themes/comunidadtv/images/logo.png