From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 20 Apr 2012 21:25:30 +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=7dd79523c75c3cd238fb1c0cb7ccb346a6569811

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

7dd79523c75c3cd238fb1c0cb7ccb346a6569811