projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c02230b 4bec9e4)
Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Thu, 19 Feb 2009 07:24:40 +0000 (02:24 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Thu, 19 Feb 2009 07:24:40 +0000 (02:24 -0500)

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