From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 6 Jun 2016 17:21:09 +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=65b639012a5dc547eccb01fd0e55efd4aa728039

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

65b639012a5dc547eccb01fd0e55efd4aa728039