projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9cc9223 7485d66)
Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Mon, 9 Feb 2009 04:59:35 +0000 (23:59 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Mon, 9 Feb 2009 04:59:35 +0000 (23:59 -0500)

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