From: Jonathan Prykop <jonathan@freeside.biz>
Date: Thu, 2 Jul 2015 18:17:00 +0000 (-0500)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=379c06ccd4b984bfa8130d98f862799239a8d00c

Merge branch 'master' of git.freeside.biz:/home/git/freeside
---

379c06ccd4b984bfa8130d98f862799239a8d00c