modified:   applications/controlies/controllers/logprinter.py
	modified:   applications/controlies/controllers/reports.py
	modified:   applications/controlies/views/laptops/index.html
	modified:   applications/controlies/views/logprinter/index.html
	modified:   debian/changelog
	modified:   packages/controlies-client_0.6.5-5_all.deb
	modified:   packages/controlies-thinclient_0.6.5-5_all.deb
	modified:   packages/controlies_0.6.5-5_all.deb
	deleted:    puppet/controlies_borrar_antiguos/manifests/init.pp~
	modified:   puppet/instala_controlies.zip
	modified:   puppet/instala_controlies/files/controlies-client_0.6.5-5_all.deb
	modified:   puppet/instala_controlies/files/controlies-thinclient_0.6.5-5_all.deb
	modified:   puppet/instala_controlies/files/controlies_0.6.5-5_all.deb
Merge branch 'master' of https://github.com/manumora/controlies