projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e114a5f b441b59)
Merge branch 'master' of http://lair.fifthhorseman.net/~jrollins/git/monkeysphere
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 8 Mar 2008 23:42:23 +0000 (18:42 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 8 Mar 2008 23:42:23 +0000 (18:42 -0500)

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