From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 4 Jun 2015 21:03:23 +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=507f1933d20b58119cc8a23f673070ae69422fc2

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

507f1933d20b58119cc8a23f673070ae69422fc2