From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 1 Feb 2017 20:16:26 +0000 (-0800)
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=375b84b1dcca3fb2f71aa3ac63281164501acc1e

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

375b84b1dcca3fb2f71aa3ac63281164501acc1e