From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 20 Jan 2016 12:46:18 +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=5d5ed9e94c8c9520f8d36ef23bbe47a135c35639

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

5d5ed9e94c8c9520f8d36ef23bbe47a135c35639