projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec9ded7 533d79f)
Merge branch 'master' of webmaster@george.riseup.net:monkeysphere
authorMicah Anderson <micah@riseup.net>
Tue, 19 Aug 2008 01:25:16 +0000 (21:25 -0400)
committerMicah Anderson <micah@riseup.net>
Tue, 19 Aug 2008 01:25:16 +0000 (21:25 -0400)

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