projects / monkeysphere-validation-agent.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb3faf6 5a3790c)
Merge remote branch 'jrollins/master'
authormike castleman <m@mlcastle.net>
Sat, 9 Jan 2010 22:30:07 +0000 (17:30 -0500)
committermike castleman <m@mlcastle.net>
Sat, 9 Jan 2010 22:30:07 +0000 (17:30 -0500)
Conflicts:
xul-ext/chrome/content/monkeysphere.js


Trivial merge
Monkeysphere public key validation daemon