projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b3b077 83aa131)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 17 Jul 2009 13:42:23 +0000 (09:42 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 17 Jul 2009 13:42:23 +0000 (09:42 -0400)

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