edit file ignore
cambios server
cambio fetch
cambios server
delete tmp para que ignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_validoc_ternium_comentarios
	app/tmp/cache/models/myapp_cake_model_default_validoc_ternium_feedbacks
	app/tmp/cache/models/myapp_cake_model_default_validoc_ternium_list
	app/tmp/cache/models/myapp_cake_model_default_validoc_ternium_paises
	app/tmp/cache/models/myapp_cake_model_default_validoc_ternium_users
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_es
	app/tmp/cache/persistent/myapp_cake_core_cake_es
	app/tmp/cache/persistent/myapp_cake_core_default_es
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log
delete tmp
Merge remote-tracking branch 'origin/riter'

Conflicts:
	.gitignore
cambios tipos calculo y otros
detalles de mensajes
borrado de cache cakephp
cambios con git rm -r --cached
service login