From: Brian Medley <bpm@snafu.org>
Date: Sun, 22 Apr 2012 23:48:00 +0000 (-0500)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;ds=inline;h=aa028b1f28a468df2a3d3a5ff03a856bba2c1254;p=freeside.git

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

aa028b1f28a468df2a3d3a5ff03a856bba2c1254