projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b38d445 b5555ee)
Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Thu, 19 Feb 2009 08:59:52 +0000 (03:59 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Thu, 19 Feb 2009 08:59:52 +0000 (03:59 -0500)

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