projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f10408 53510d5)
Merge branch 'master' of http://micah.riseup.net/git/monkeysphere
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Sat, 8 Mar 2008 23:45:35 +0000 (18:45 -0500)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Sat, 8 Mar 2008 23:45:35 +0000 (18:45 -0500)

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