Fix output of sample file
	modified:   ts/5.2/build
Merge branch 'master' of ssh://github.com/Thinstation/thinstation into 5.2-Stable
Merge branch 'master' into 5.2-Stable
Merge branch 'master' into 5.2-Stable
Merge branch 'master' into 5.2-Stable
	modified:   ts/bin/update
	modified:   ts/5.2/packages/base/build/conf/10master
Merge remote-tracking branch 'upstream/master'