From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 18 Jun 2013 22:26:02 +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=20e279396ac0a7a99a3dc9c831e44f435035d17f;p=freeside.git

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

20e279396ac0a7a99a3dc9c831e44f435035d17f