From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 4 Sep 2013 05:52:26 +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=36ad5e538cb56de33c779e34baf9abdf63c4312e

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

36ad5e538cb56de33c779e34baf9abdf63c4312e