Merge commit '2.5.0' into moonshot-packaging-fixes
authorSam Hartman <hartmans@painless-security.com>
Wed, 26 Sep 2012 01:26:19 +0000 (21:26 -0400)
committerSam Hartman <hartmans@painless-security.com>
Wed, 26 Sep 2012 01:26:19 +0000 (21:26 -0400)
Conflicts:
shibboleth.spec.in


No differences found