From ecb7de9b4e304faec007f734489e0a025efa70c4 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Tue, 26 May 2015 00:45:29 -0400
Subject: Merge branch 'master' into feature/installer-integration

Conflicts:
	lib/cmd/install.sh
---
(limited to 'installers')

--
cgit v0.9.1