From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 29 Jun 2016 17:02:46 +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=cd254e04ba204b5d0b4a69b65c392fb175dd1e97

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

cd254e04ba204b5d0b4a69b65c392fb175dd1e97