From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 23 Nov 2015 22:56:43 +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=f68d7f0bf0dbf710fc0b03408723129a543838a3

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

f68d7f0bf0dbf710fc0b03408723129a543838a3