projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ae4c1f 86d072e)
Merge commit 'dkg/master'
authorJamie McClelland <jm@mayfirst.org>
Tue, 16 Sep 2008 14:01:58 +0000 (10:01 -0400)
committerJamie McClelland <jm@mayfirst.org>
Tue, 16 Sep 2008 14:01:58 +0000 (10:01 -0400)

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