From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 4 Apr 2012 22:41:23 +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=3de7385d0a6ad25fa300f50929473f33998ea858;p=freeside.git

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

3de7385d0a6ad25fa300f50929473f33998ea858