From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 13 Jun 2015 22:48:53 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=73a6a80a9ca5edbd43d139b7cb25bfee4abfd35e;p=freeside.git

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

73a6a80a9ca5edbd43d139b7cb25bfee4abfd35e