[cpp-sp] 11/42: Merge branch 'tmp'

[Scott Cantor]

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

scantor pushed a commit to annotated tag debian/2.4.2+dfsg-1
in repository cpp-sp.

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

commit f5f2d618024f3ec44320de89d738a73e1cf03ac3
Merge: 672e2ec 3e8d830
Author: Russ Allbery <rra at debian.org>
AuthorDate: Tue Mar 8 17:33:19 2011 -0800

    Merge branch 'tmp'

 debian/changelog                     | 31 ++++++++++++++++++++++++++++++-
 debian/control                       |  5 +++--
 debian/libapache2-mod-shib2.postinst |  8 ++++++++
 debian/rules                         |  1 +
 debian/watch                         |  4 ++--
 5 files changed, 44 insertions(+), 5 deletions(-)

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