From: Zachary Stevens <zts@cryptocracy.com>
Date: Sat, 7 Nov 2009 19:12:00 +0000 (+0000)
Subject: Merge branch 'master' into model-reorg
X-Git-Tag: 0.000000_01~68^2~3
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3915a3f1623ba633d330a51209190fb9c9ba4f5d;p=catagits%2FGitalist.git

Merge branch 'master' into model-reorg
---

3915a3f1623ba633d330a51209190fb9c9ba4f5d