From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 25 Apr 2016 21:44:52 +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=5c3409b2a987a9a6fc6ca77bcaceb4b7cefa03de

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

5c3409b2a987a9a6fc6ca77bcaceb4b7cefa03de