From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 28 Sep 2016 19:06:48 +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=1d0374a383ba412f9e9390705965a9d8467508f7

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

1d0374a383ba412f9e9390705965a9d8467508f7