From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 24 Feb 2012 08:12:31 +0000 (-0800)
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=7cfa84ec05dd75cd550cbb2c1ddac4161518fd1e

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

7cfa84ec05dd75cd550cbb2c1ddac4161518fd1e