From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 17 Nov 2016 01:10:12 +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=a5a541f3b1db3192f7d4a7dd5ad1fbf5800ef586

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

a5a541f3b1db3192f7d4a7dd5ad1fbf5800ef586