-
-
-
Merge branch 'master' of https://github.com/jrosco/posinstall

Conflicts:
	conf/settings