[Pkg-fedora-ds-maintainers] [libapache2-mod-nss] 145/156: Merge remote-tracking branch 'origin/upstream' 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 80ba95f54459f2c295bbd193e6f3e3a85e840e12
Merge: 07c2729 5b6aaed
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Jul 2 11:29:02 2014 +0300

    Merge remote-tracking branch 'origin/upstream' into master-n


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