From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 7 Dec 2016 00:15:42 +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=ecd038f7ae5c1ffc929f3c928ecd161eeb45d9be

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

ecd038f7ae5c1ffc929f3c928ecd161eeb45d9be