From 2cd968e982bb9942e6d044270a42de88d8d01b67 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Tue, 26 May 2015 18:07:14 -0400
Subject: Merge branch 'feature/installer-integration'

---
(limited to 'src/main.sh')

--
cgit v0.9.1