projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2848cd3 c4b0a1e)
Merge remote branch 'dkg/master'
authorJameson Rollins <jrollins@finestructure.net>
Mon, 18 Jan 2010 04:01:35 +0000 (23:01 -0500)
committerJameson Rollins <jrollins@finestructure.net>
Mon, 18 Jan 2010 04:01:35 +0000 (23:01 -0500)

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