changes in srcml wrapper and codegenerator
Merge branch 'master' of github.com:lashgar/ipmacctest2

Conflicts:
	clean-all