[Pkg-fedora-ds-maintainers] [libapache2-mod-nss] 146/156: Merge branch 'master' into master-n

[Timo Aaltonen]

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

tjaalton-guest pushed a commit to branch master
in repository libapache2-mod-nss.

commit 4ab8f775b30ac0875c862f890f03ade16456f954
Merge: 80ba95f bdbd987
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Jul 2 11:29:10 2014 +0300

    Merge branch 'master' into master-n

 debian/README.Debian                            |  16 ++
 debian/changelog                                |  84 +++++++++
 debian/compat                                   |   1 +
 debian/control                                  |  33 ++++
 debian/copyright                                |  23 +++
 debian/docs                                     |   2 +
 debian/libapache2-mod-nss.apache2               |   2 +
 debian/libapache2-mod-nss.dirs                  |   1 +
 debian/libapache2-mod-nss.install               |   3 +
 debian/nss.conf                                 | 203 ++++++++++++++++++++
 debian/nss.load                                 |   1 +
 debian/patches/fix_build                        |  14 ++
 debian/patches/mod_nss-clientauth.patch         |  50 +++++
 debian/patches/mod_nss-conf.patch               |  70 +++++++
 debian/patches/mod_nss-gencert.patch            |  26 +++
 debian/patches/mod_nss-httpd24.patch            | 135 +++++++++++++
 debian/patches/mod_nss-lockpcache.patch         | 240 ++++++++++++++++++++++++
 debian/patches/mod_nss-negotiate.patch          | 184 ++++++++++++++++++
 debian/patches/mod_nss-nssverifyclient.patch    |  12 ++
 debian/patches/mod_nss-overlapping_memcpy.patch |  24 +++
 debian/patches/mod_nss-pcachesignal.patch       |  21 +++
 debian/patches/mod_nss-reseterror.patch         |  10 +
 debian/patches/mod_nss-reverseproxy.patch       | 182 ++++++++++++++++++
 debian/patches/mod_nss-wouldblock.patch         |  12 ++
 debian/patches/series                           |  14 ++
 debian/patches/speling_fixes                    |  14 ++
 debian/rules                                    |  93 +++++++++
 debian/source/format                            |   1 +
 debian/watch                                    |   3 +
 29 files changed, 1474 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-fedora-ds/libapache2-mod-nss.git