From: Mark Wells <mark@freeside.biz>
Date: Wed, 6 Jul 2016 18:48:45 +0000 (-0700)
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=df43a12a1c219709f27297ad6b53f6662b56c10c

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

df43a12a1c219709f27297ad6b53f6662b56c10c