modified:   applications/controlies/controllers/default.py
	modified:   debian/changelog
	deleted:    packages/controlies-client_0.6.5-7_all.deb
	new file:   packages/controlies-client_0.6.5-8_all.deb
	deleted:    packages/controlies-thinclient_0.6.5-7_all.deb
	new file:   packages/controlies-thinclient_0.6.5-8_all.deb
	deleted:    packages/controlies_0.6.5-7_all.deb
	new file:   packages/controlies_0.6.5-8_all.deb
	modified:   puppet/instala_controlies.zip
	deleted:    puppet/instala_controlies/files/controlies-client_0.6.5-7_all.deb
	new file:   puppet/instala_controlies/files/controlies-client_0.6.5-8_all.deb
	deleted:    puppet/instala_controlies/files/controlies-thinclient_0.6.5-7_all.deb
	new file:   puppet/instala_controlies/files/controlies-thinclient_0.6.5-8_all.deb
	deleted:    puppet/instala_controlies/files/controlies_0.6.5-7_all.deb
	new file:   puppet/instala_controlies/files/controlies_0.6.5-8_all.deb
	modified:   puppet/instala_controlies/manifests/init.pp
Merge remote-tracking branch 'upstream/master'
Filtros y grubpos en informes logprinter
Filtros y grupos en informes logprinter
Actualizado NOTAS