projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9a5685 9c94e93)
Merge commit 'dkg/master'
authorMicah Anderson <micah@riseup.net>
Thu, 19 Jun 2008 03:35:20 +0000 (23:35 -0400)
committerMicah Anderson <micah@riseup.net>
Thu, 19 Jun 2008 03:35:20 +0000 (23:35 -0400)
Conflicts:

doc/MonkeySpec


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