From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 16 Oct 2016 22:12:35 +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=e322fbb08d0f837be3f3f8e7c92a4a5bc75030ad

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

e322fbb08d0f837be3f3f8e7c92a4a5bc75030ad