From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 25 Mar 2016 17:22:20 +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=da9ab0af53220f6f1cb0e4d31ce7de81dd591783

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

da9ab0af53220f6f1cb0e4d31ce7de81dd591783