projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aefed40 6f59a15)
Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Thu, 23 Jul 2009 04:48:45 +0000 (00:48 -0400)
committerJameson Graef Rollins <jrollins@finestructure.net>
Thu, 23 Jul 2009 04:48:45 +0000 (00:48 -0400)

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