From: Sam Hartman <hartmans@painless-security.com>
Date: Mon, 10 Oct 2011 15:02:32 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/moonshot' into HEAD
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fresolver.git;a=commitdiff_plain;h=a1027dcd31920baeb3471e4d7923845251ee0556

Merge remote-tracking branch 'origin/moonshot' into HEAD
---

a1027dcd31920baeb3471e4d7923845251ee0556