From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 23 Nov 2015 03:44:48 +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=c20f301dd7c437a0d8be414a174dd09721bd8e9a;hp=-c

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

c20f301dd7c437a0d8be414a174dd09721bd8e9a