From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Sat, 11 Oct 2008 21:19:50 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.16-1~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=91d16f389d27fa8e9e7ed721029334e187506da1;p=monkeysphere.git

Merge commit 'dkg/master'
---

91d16f389d27fa8e9e7ed721029334e187506da1