projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23b12bd 4d3d6d2)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 10 Mar 2009 21:40:07 +0000 (17:40 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 10 Mar 2009 21:40:07 +0000 (17:40 -0400)

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