fix merge fail
Merge branch 'master' of github.com:spitfire05/svn-smf-hook

Conflicts:
	svn-smf-hook.py