projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13ff1e0 440ee62)
Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Tue, 17 Feb 2009 07:03:22 +0000 (02:03 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Tue, 17 Feb 2009 07:10:35 +0000 (02:10 -0500)

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