From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 11 Jan 2016 15:05:28 +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=6afa478edfc56ffb5022d4fbaf2902774ff8d2d3

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

6afa478edfc56ffb5022d4fbaf2902774ff8d2d3