From: Sam Hartman <hartmans@painless-security.com>
Date: Sat, 3 Nov 2012 09:53:01 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/moonshot' into HEAD
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=62c42960e3bdc1d1fb318f01644e8bc7fd0639b7;hp=-c;p=shibboleth%2Fresolver.git

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

62c42960e3bdc1d1fb318f01644e8bc7fd0639b7