From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 23 Feb 2012 06:07:38 +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=d7c50ca6ded0c72bb1b91326da3ff1d7ed45c2b0

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

d7c50ca6ded0c72bb1b91326da3ff1d7ed45c2b0