projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f29ad7 504dc46)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 25 Oct 2008 18:17:50 +0000 (14:17 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 25 Oct 2008 18:17:50 +0000 (14:17 -0400)

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