From: mike castleman <m@mlcastle.net>
Date: Sat, 9 Jan 2010 22:30:07 +0000 (-0500)
Subject: Merge remote branch 'jrollins/master'
X-Git-Tag: msva-perl/0.1~37^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e1d74fa7176646600abf717e5884023c9188cd3e;p=monkeysphere-validation-agent.git

Merge remote branch 'jrollins/master'

Conflicts:
	xul-ext/chrome/content/monkeysphere.js
---

e1d74fa7176646600abf717e5884023c9188cd3e