From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 14 Feb 2017 16:33:21 +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=bd5c864f75fd5d4aaddd60d2ba1ebc15f14a9aa8

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

bd5c864f75fd5d4aaddd60d2ba1ebc15f14a9aa8