From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 1 Feb 2017 17:32:28 +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=edd6a339eb7ea156272264ffd164711fc8af792e

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

edd6a339eb7ea156272264ffd164711fc8af792e