projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c6c9e8 4dea1f0)
Merge commit 'jrollins/master'
authorJamie McClelland <jm@mayfirst.org>
Sat, 6 Sep 2008 06:59:21 +0000 (02:59 -0400)
committerJamie McClelland <jm@mayfirst.org>
Sat, 6 Sep 2008 06:59:21 +0000 (02:59 -0400)

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