From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 4 Jun 2016 00:23:02 +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=d22baa4e71bfa9e153c1fe1152ff4c748f1d935c

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

d22baa4e71bfa9e153c1fe1152ff4c748f1d935c