modified:   applications/controlies/controllers/gestion.py
	modified:   applications/controlies/models/menu.py
	modified:   applications/controlies/modules/Hosts.py
	modified:   applications/controlies/modules/NetworkUtils.py
	modified:   applications/controlies/modules/Thinclients.py
	modified:   applications/controlies/modules/Utils/LdapUtils.py
	modified:   applications/controlies/views/gestion/execCommand.html
	modified:   applications/controlies/views/gestion/servidores_aula.html
	modified:   applications/controlies/views/laptops/form_history.html
	modified:   clients/rpc/RPCServer.py
	modified:   debian/changelog
	modified:   debian/control
	modified:   debian/controlies-client.install
	new file:   applications/controlies/views/gestion/wakeupThin.html
	new file:   clients/rpc/97controlies-client
	new file:   clients/rpc/controlies.dhcp
Merge branch 'master' of https://github.com/manumora/controlies
	modified:   debian/changelog
	deleted:    packages/controlies-client_0.6.5-6_all.deb
	new file:   packages/controlies-client_0.6.5-7_all.deb
	deleted:    packages/controlies-thinclient_0.6.5-6_all.deb
	new file:   packages/controlies-thinclient_0.6.5-7_all.deb
	deleted:    packages/controlies_0.6.5-6_all.deb
	new file:   packages/controlies_0.6.5-7_all.deb
	modified:   puppet/instala_controlies.zip
	deleted:    puppet/instala_controlies/files/controlies-client_0.6.5-6_all.deb
	new file:   puppet/instala_controlies/files/controlies-client_0.6.5-7_all.deb
	deleted:    puppet/instala_controlies/files/controlies-thinclient_0.6.5-6_all.deb
	new file:   puppet/instala_controlies/files/controlies-thinclient_0.6.5-7_all.deb
	deleted:    puppet/instala_controlies/files/controlies_0.6.5-6_all.deb
	new file:   puppet/instala_controlies/files/controlies_0.6.5-7_all.deb
	modified:   puppet/instala_controlies/manifests/init.pp