From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 12 Feb 2015 10:33:13 +0000 (-0800)
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;h=f3bfabe2cea97fd34610cfc6ea94c4177fcef336;p=freeside.git

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

f3bfabe2cea97fd34610cfc6ea94c4177fcef336