From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 10 Jul 2015 00:57:01 +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=aa9537af853969b34d2da6ca855f1d2fcdec16d4

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

aa9537af853969b34d2da6ca855f1d2fcdec16d4