From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 6 Feb 2014 17:34:37 +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=02b8d7a9f1689ccd74d749bc18ed2d0d17447925;p=freeside.git

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

02b8d7a9f1689ccd74d749bc18ed2d0d17447925