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

src/monkeysphere-server


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