03 Master.txt
01 ISS53
01 hotfix
02 ISS53.txt
01 hotfix + iss53
Merge branch 'master' of https://github.com/stoskov/mergetest

Conflicts:
	01 hotfix.txt