From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 28 Oct 2015 18:24:46 +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=3888fd6d1902f93c19d62df186e04617357f58c5

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

3888fd6d1902f93c19d62df186e04617357f58c5