Promofaux 2d895f328c Fix merge conflicts

2016-02-20 15:38:39 +00:00

..

basic-install.sh

Fix merge conflicts

2016-02-20 15:38:39 +00:00

uninstall.sh

Updated License

2016-01-30 15:12:40 -05:00