From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 3 Feb 2016 23:30:21 +0000 (-0800)
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=edd6d86985198ff5b04611e5bb4b5633cda6f81a

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

edd6d86985198ff5b04611e5bb4b5633cda6f81a