[cpp-sp] 03/04: Merge branch 'master' into etch

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to tag etch/2.1.dfsg1-2
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=4ce6ad7d8d5eda4164ac906aee81fe44fea57440

commit 4ce6ad7d8d5eda4164ac906aee81fe44fea57440
Merge: be4ac4a 82f618b
Author: Ferenc Wagner <wferi at niif.hu>
AuthorDate: Mon Nov 17 19:23:46 2008 +0100

    Merge branch 'master' into etch

 configs/shibd-debian.in              |  5 ++---
 debian/changelog                     | 21 +++++++++++++++++++--
 debian/libapache2-mod-shib2.NEWS     | 10 ++++++++++
 debian/libapache2-mod-shib2.install  |  2 +-
 debian/libapache2-mod-shib2.postinst | 31 +++++++++++++++++++++++++++++++
 debian/libapache2-mod-shib2.prerm    |  2 +-
 debian/man-pages/shibd.pod           |  2 ++
 debian/{shib.load => shib2.load}     |  0
 8 files changed, 66 insertions(+), 7 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.