From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 13 Nov 2015 21:06:00 +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=2d3ab45cd0b35cb929198e2ad36a1ec9a3b4d93d

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

2d3ab45cd0b35cb929198e2ad36a1ec9a3b4d93d