auto_deploy script deploying for windows mié nov 20 21:50:41 CET 2013
 auto_deploy script deploying for mac mié nov 20 21:51:07 CET 2013
 auto_deploy script deploying for windows mié nov 20 21:53:31 CET 2013
 auto_deploy script deploying for mac mié nov 20 21:53:42 CET 2013
 auto_deploy script deploying for windows mié nov 20 21:56:10 CET 2013
 auto_deploy script deploying for mac mié nov 20 21:56:23 CET 2013
 auto_deploy script deploying for mac mié nov 20 21:57:24 CET 2013
Merge branch 'windows'

Conflicts:
	windows/RenegadeKlingon.exe
Merge branch 'mac'

Conflicts:
	windows/RenegadeKlingon.exe