From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 23 Oct 2015 23:17:51 +0000 (-0700)
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=80c2d997c5c983344c530ecbb46f94f1c299b35f

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

80c2d997c5c983344c530ecbb46f94f1c299b35f