From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 21 Jul 2015 22:16:21 +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=49c58715c06a5150805fd3019a72dc1bc6361514

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

49c58715c06a5150805fd3019a72dc1bc6361514