From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 5 Oct 2015 21:43:05 +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=cace897d9c5fbe1f80277b0cb14e85c9d2272cf1

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

cace897d9c5fbe1f80277b0cb14e85c9d2272cf1