From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 16 May 2016 23:05:30 +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=a0877673b88d523c3c4ede51ff2c238285d8aeea

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

a0877673b88d523c3c4ede51ff2c238285d8aeea