From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 5 Nov 2015 18:44: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=5da68ff1a7c638e30cbafbc9b0749f1e82b333df

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

5da68ff1a7c638e30cbafbc9b0749f1e82b333df