From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 21 Jul 2015 02:09:28 +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=7efd35e863da5de4bbfcad24ad73da7ec7385f62

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

7efd35e863da5de4bbfcad24ad73da7ec7385f62