From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 5 Apr 2014 00:30:38 +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=5b7eefb9f9f6f0fb6bcb6ef3767cbbabd638c29f

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

5b7eefb9f9f6f0fb6bcb6ef3767cbbabd638c29f