projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0059745 80453e1)
Merge commit 'micah/master' monkeysphere_0.21-1
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 15 Nov 2008 21:21:54 +0000 (16:21 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 15 Nov 2008 21:21:54 +0000 (16:21 -0500)

Trivial merge
Bernie's friendly fork of http://web.monkeysphere.info/