projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e26301 52d692d)
Merge commit 'dkg/master'
authorMicah Anderson <micah@riseup.net>
Wed, 3 Sep 2008 19:28:30 +0000 (15:28 -0400)
committerMicah Anderson <micah@riseup.net>
Wed, 3 Sep 2008 19:28:30 +0000 (15:28 -0400)

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