-n 
Merge commit '40fee6f80f425985272ec6d9a2b4ad2547c6e7db' into splitjs

Conflicts:
	app/assets/javascripts/TortoiseJS/README.md