Add version.txt hook for git
Merge remote-tracking branch 'origin/trunk' into trunk