From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 11 Jun 2012 22:05:30 +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=f89471ac01284a6d73ebffd6eaebdde79d5f25dc

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

f89471ac01284a6d73ebffd6eaebdde79d5f25dc