From: Mark Wells <mark@freeside.biz>
Date: Fri, 5 Oct 2012 20:23:58 +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=a977d27ac2e9d8f8e1adbbdcfc3547bc378dde63

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

a977d27ac2e9d8f8e1adbbdcfc3547bc378dde63