From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 7 May 2015 02:10:47 +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=f921a017cd3dd987bd48e05c7fd462a1ef9cb79d

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

f921a017cd3dd987bd48e05c7fd462a1ef9cb79d