From: Brian Medley <bpm@snafu.org>
Date: Fri, 20 Apr 2012 17:41:57 +0000 (-0500)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=8abffa51cf2846154e9a893fc2af24db99f49c69;p=freeside.git

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

8abffa51cf2846154e9a893fc2af24db99f49c69