From: Mark Wells <mark@freeside.biz>
Date: Sun, 12 Jun 2016 06:22:47 +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=6c621a877528c9eebab92579a243ca739175320d

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

6c621a877528c9eebab92579a243ca739175320d