Signed-off-by: stefano <stefanofg@gmail.com>
Merge branch 'master' of ssh://gitolite@develabc.com:3622/gitscriptbuilder.git

Conflicts:
	src/gitscriptbuilder.pro.user
Merge branch 'master' of https://github.com/stefanofg/gitscriptbuilder.git

Conflicts:
	src/gitscriptbuilder.pro.user