From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 2 Apr 2012 17:37:52 +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=f84937b2a6cc6ba63cdab177866b1417c32b1028

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

f84937b2a6cc6ba63cdab177866b1417c32b1028