From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 15 Apr 2012 22:38:47 +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=820fe0ac288d4f2bb975b7f58ee02baefd96ed24

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

820fe0ac288d4f2bb975b7f58ee02baefd96ed24