From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 10 Mar 2015 18:51:18 +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=7e02bdd1d34068129b9f63970f59e9f6562a105a

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

7e02bdd1d34068129b9f63970f59e9f6562a105a