From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 6 May 2012 08:04:18 +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=246670205503b6bcd91130325d2d9050fb7b74e5

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

246670205503b6bcd91130325d2d9050fb7b74e5