From: Jonathan Prykop <jonathan@freeside.biz>
Date: Tue, 15 Nov 2016 09:10:32 +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=8568f687b70154d27c32fe16b0d018420807ded1

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

8568f687b70154d27c32fe16b0d018420807ded1