modified:   applications/controlies/controllers/laptops.py
	modified:   applications/controlies/controllers/thinclients.py
	modified:   applications/controlies/models/controliesDB.py
	modified:   applications/controlies/models/menu.py
	modified:   applications/controlies/modules/Groups.py
	modified:   applications/controlies/modules/Laptops.py
	modified:   applications/controlies/modules/LaptopsHistory.py
	modified:   applications/controlies/modules/Thinclients.py
	modified:   applications/controlies/static/css/superfish.css
	modified:   applications/controlies/views/laptops/form.html
	modified:   applications/controlies/views/laptops/form_history.html
	modified:   applications/controlies/views/laptops/history.html
	modified:   applications/controlies/views/laptops/index.html
	modified:   applications/controlies/views/thinclients/index.html
	modified:   clients/rpc/RPCServer.py
	modified:   packages/controlies-client_0.6.6-1_all.deb
	modified:   packages/controlies-thinclient_0.6.6-1_all.deb
	modified:   packages/controlies_0.6.6-1_all.deb
	modified:   puppet/instala_controlies.zip
	modified:   puppet/instala_controlies/files/controlies-client_0.6.6-1_all.deb
	modified:   puppet/instala_controlies/files/controlies-thinclient_0.6.6-1_all.deb
	modified:   puppet/instala_controlies/files/controlies_0.6.6-1_all.deb
	applications/controlies/controllers/stadistics.py
	applications/controlies/views/stadistics/
	applications/controlies/views/thinclients/databaseDump.html
	new file:   applications/controlies/controllers/stadistics.py
	new file:   applications/controlies/views/stadistics/index.html
	new file:   applications/controlies/views/thinclients/databaseDump.html
Merge branch 'master' of https://github.com/manumora/controlies

Conflicts:
	packages/controlies-client_0.6.6-1_all.deb
	packages/controlies-thinclient_0.6.6-1_all.deb
	packages/controlies_0.6.6-1_all.deb
	puppet/instala_controlies.zip
	puppet/instala_controlies/files/controlies-client_0.6.6-1_all.deb
	puppet/instala_controlies/files/controlies-thinclient_0.6.6-1_all.deb
	puppet/instala_controlies/files/controlies_0.6.6-1_all.deb

	modified:   NOTAS
	modified:   clients/99seguimiento_usuario
	modified:   clients/PostSession
	modified:   clients/controlies-seguimiento
	deleted:    clients/dhclient-script-networkmanager
	modified:   clients/seguimiento_equipo
	modified:   clients/seguimiento_impresion
	modified:   debian/changelog
	modified:   debian/controlies-client.install
	modified:   debian/controlies-client.postinst
	modified:   debian/controlies-client.postrm
	deleted:    packages/controlies-client_0.6.6-1_all.deb
	deleted:    packages/controlies-thinclient_0.6.6-1_all.deb
	deleted:    packages/controlies_0.6.6-1_all.deb
	modified:   puppet/actualizaciones_controlies.zip
	deleted:    puppet/actualizaciones_controlies/files/dhclient.conf
	modified:   puppet/actualizaciones_controlies/manifests/init.pp
	modified:   puppet/instala_controlies/manifests/init.pp