From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 22 Apr 2015 21:33:50 +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/?a=commitdiff_plain;ds=sidebyside;h=4d27115f3f5d290602d1c656d8b20d5bbfc30f4d;p=freeside.git

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

4d27115f3f5d290602d1c656d8b20d5bbfc30f4d