From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 10 Apr 2015 16:33:56 +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=bc75a214c30ca0ae7554cc60d4f7754f5ea03366

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

bc75a214c30ca0ae7554cc60d4f7754f5ea03366