From: Mark Wells <mark@freeside.biz>
Date: Tue, 3 May 2016 20:49:31 +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=1443045cf75c0bba05a753d6036327a8092bcfca

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

1443045cf75c0bba05a753d6036327a8092bcfca