Mcat12 0042e3ae02 Merge branch 'development' into CBH/UpstreamDNS ...

Conflicts:
	automated install/basic-install.sh

2016-01-30 13:28:01 -05:00

..

basic-install.sh

Merge branch 'development' into CBH/UpstreamDNS

2016-01-30 13:28:01 -05:00

uninstall.sh

fixes #169

2016-01-16 14:10:03 -06:00