From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 4 Nov 2016 00:25:05 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=39b05a617a55fe0bb072cde02a5c1b5b16301f62

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

39b05a617a55fe0bb072cde02a5c1b5b16301f62