From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 19 Oct 2014 19:19:08 +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=c9994d080422aec5188ee08851a493ce1794c3b7

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

c9994d080422aec5188ee08851a493ce1794c3b7