From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 4 Aug 2016 00:52:34 +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=cf54023e010df76e0c39ac70902877d7c4c94c6e;p=freeside.git

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

cf54023e010df76e0c39ac70902877d7c4c94c6e