projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b37c81f cd40693)
Merge commit 'dkg/master'
authorJamie McClelland <jm@mayfirst.org>
Mon, 28 Jul 2008 01:35:08 +0000 (21:35 -0400)
committerJamie McClelland <jm@mayfirst.org>
Mon, 28 Jul 2008 01:35:08 +0000 (21:35 -0400)

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