From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 8 May 2018 19:50:23 +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=aa20afbcdd752835076600f1ba8dc3e173efe523

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

aa20afbcdd752835076600f1ba8dc3e173efe523