From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 4 Feb 2015 21:10:51 +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/?p=freeside.git;a=commitdiff_plain;h=745e36b35b36607f450d16944469f52e362bf934

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

745e36b35b36607f450d16944469f52e362bf934