auto_deploy script deploying for linux mié nov 20 21:50:18 CET 2013
Merge branch 'linux'

Conflicts:
	windows/RenegadeKlingon.exe