From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 4 Dec 2014 22:47:54 +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=fcb230261cbd138c1869f6db4a443ac7ae2a98a1

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

fcb230261cbd138c1869f6db4a443ac7ae2a98a1