From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 26 Oct 2008 22:58:31 +0000 (-0400)
Subject: Merge commit 'micah/master'
X-Git-Tag: monkeysphere_0.17-1~6^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=03468ed21363bda286207850fc42d1db51b892d7;p=monkeysphere.git

Merge commit 'micah/master'
---

03468ed21363bda286207850fc42d1db51b892d7