projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54abd85 90e182f)
Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Sat, 28 Feb 2009 18:11:31 +0000 (13:11 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sat, 28 Feb 2009 18:11:31 +0000 (13:11 -0500)

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