projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 909d963 d8d2650)
Merge commit 'dkg/master'
authorMicah Anderson <micah@riseup.net>
Tue, 18 Nov 2008 06:36:18 +0000 (01:36 -0500)
committerMicah Anderson <micah@riseup.net>
Tue, 18 Nov 2008 06:36:18 +0000 (01:36 -0500)

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