From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 3 Nov 2015 17:00: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=a87e91ee19d14a6fc3da62f4b44a9628d32bb6a3

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

a87e91ee19d14a6fc3da62f4b44a9628d32bb6a3