From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 4 Jun 2016 01:26:05 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=9c2854f48fb79a5534bbb35c4b7c12b2e6acc0a4;hp=9c2854f48fb79a5534bbb35c4b7c12b2e6acc0a4;p=freeside.git

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