From: Jonathan Prykop <jonathan@freeside.biz>
Date: Fri, 18 Nov 2016 11:19:46 +0000 (-0600)
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=2a56c671635687bf2648eb3a7cf4bce228101af3

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

2a56c671635687bf2648eb3a7cf4bce228101af3