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

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