projects / monkeysphere-validation-agent.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d229e51 948c6a0)
Merge remote branch 'mlcastle/master'
authorJameson Rollins <jrollins@finestructure.net>
Sat, 9 Jan 2010 22:34:33 +0000 (17:34 -0500)
committerJameson Rollins <jrollins@finestructure.net>
Sat, 9 Jan 2010 22:34:33 +0000 (17:34 -0500)
Conflicts:
xul-ext/chrome/content/monkeysphere.js


Trivial merge
Monkeysphere public key validation daemon