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)
commit3c1e801d6539b92d6d3d7fb40d661a7ce630ec44
tree948f1cdb35ec1363358af01e0b1a11b7f798e464
parentf2621219507344852f967e4099e9c341499eb802
parent950e3ea93d435fb3fc8c1d9c1bc7b0d4cd476699
Merge commit '2.5.0' into moonshot-packaging-fixes

Conflicts:
shibboleth.spec.in
shibboleth.spec.in