From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 3 Feb 2016 04:57:38 +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=1115692072f22567e4f4359920fff947eed5df4e

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

1115692072f22567e4f4359920fff947eed5df4e