projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7e1788 b3a701f)
Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Sat, 31 Jan 2009 22:31:25 +0000 (17:31 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sat, 31 Jan 2009 22:31:25 +0000 (17:31 -0500)

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