projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e64c19d c396f64)
Merge commit 'micah/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Sun, 1 Feb 2009 03:56:26 +0000 (22:56 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sun, 1 Feb 2009 03:56:26 +0000 (22:56 -0500)

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