From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 23 Mar 2012 18:21:19 +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=879ad5135754ec2968e39cf98f7958f0db50d359

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

879ad5135754ec2968e39cf98f7958f0db50d359