From: Jameson Rollins <jrollins@finestructure.net>
Date: Sat, 9 Jan 2010 22:34:33 +0000 (-0500)
Subject: Merge remote branch 'mlcastle/master'
X-Git-Tag: msva-perl/0.1~32^2~6
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c94f45a24183a69af36dd732e73009d5d09c8d07;p=monkeysphere-validation-agent.git

Merge remote branch 'mlcastle/master'

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

c94f45a24183a69af36dd732e73009d5d09c8d07