projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5722f3c eef5c54)
Merge commit 'dkg/master'
authorMicah Anderson <micah@riseup.net>
Sun, 26 Oct 2008 16:34:56 +0000 (12:34 -0400)
committerMicah Anderson <micah@riseup.net>
Sun, 26 Oct 2008 16:34:56 +0000 (12:34 -0400)

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