projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd249af 45a38e3)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 1 Feb 2009 06:57:21 +0000 (01:57 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 1 Feb 2009 06:57:21 +0000 (01:57 -0500)

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