From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 13 Oct 2015 17:10:40 +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=2b2dd969f3c18751afc583ad1e836ab8e6f73b5d

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

2b2dd969f3c18751afc583ad1e836ab8e6f73b5d