projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b259e0e 91f3af2)
Merge commit 'mlcastle/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Sat, 15 Nov 2008 23:21:31 +0000 (18:21 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sat, 15 Nov 2008 23:21:31 +0000 (18:21 -0500)

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