projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac1e7db 062f4e0)
Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Sat, 21 Feb 2009 21:48:43 +0000 (16:48 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sat, 21 Feb 2009 21:48:43 +0000 (16:48 -0500)

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