From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 10 Jun 2016 21:21:38 +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=912cbcaf930f41cd6a087ea4bcc581aad035dd41

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

912cbcaf930f41cd6a087ea4bcc581aad035dd41