projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e371ad 710cc81)
Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Sat, 21 Feb 2009 21:17:20 +0000 (16:17 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sat, 21 Feb 2009 21:17:20 +0000 (16:17 -0500)

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