From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 17 Jul 2015 18:46:37 +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=85f0e2caa759102f68fe28278faf5f65c7b33b3c

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

85f0e2caa759102f68fe28278faf5f65c7b33b3c