From: Mark Wells <mark@freeside.biz>
Date: Thu, 6 Sep 2012 18:44:02 +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=fdb87db06d3c62a7f7536d1ed630293da94d959a

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

fdb87db06d3c62a7f7536d1ed630293da94d959a