projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 2b922e5 b5999e9)
Merge commit 'mlcastle/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Sun, 12 Jul 2009 16:03:31 +0000 (12:03 -0400)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sun, 12 Jul 2009 16:03:31 +0000 (12:03 -0400)

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