[apache2] branch master updated (b878c31 -> 373ad9a)

[Stefan Fritsch]

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

sf pushed a change to branch master
in repository apache2.

      from  b878c31   Conflict with apache2.2-common and apache2.2-bin
       new  373ad9a   fixup upstream keyring path

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/source/include-binaries | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git