From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 8 Aug 2015 05:01:31 +0000 (-0700)
Subject: Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE... 
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=0c76afbb717e1716e6126bc4a120b8d9471614a0

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

0c76afbb717e1716e6126bc4a120b8d9471614a0