From: Sam Hartman <hartmans@painless-security.com>
Date: Tue, 9 Aug 2011 20:37:13 +0000 (-0400)
Subject: Merge commit 'c1d75749e438628900ae880a3dafd96f4a97f15e' into HEAD
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fopensaml2.git;a=commitdiff_plain;h=3a96cab6a0d5bc5185238c667a77da1fec7cb4e2

Merge commit 'c1d75749e438628900ae880a3dafd96f4a97f15e' into HEAD
---

3a96cab6a0d5bc5185238c667a77da1fec7cb4e2