[apache2] branch master updated (7fcc8ce -> b878c31)

[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  7fcc8ce   Updated upstream keyring
       new  b878c31   Conflict with apache2.2-common and apache2.2-bin

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/changelog | 2 ++
 debian/control   | 2 ++
 2 files changed, 4 insertions(+)

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