From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 13 Jun 2015 22:48:48 +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=269b47e6843f31a1b35f82635ed9be1d31e5275f

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

269b47e6843f31a1b35f82635ed9be1d31e5275f