projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7bf7ac9 8001b45)
Merge commit 'dkg/master'
authorMicah Anderson <micah@riseup.net>
Sat, 31 Jan 2009 23:58:26 +0000 (18:58 -0500)
committerMicah Anderson <micah@riseup.net>
Sat, 31 Jan 2009 23:58:26 +0000 (18:58 -0500)

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