[libapache-mod-jk] 05/65: set mergeWithUpstream=1

[Markus Koschany]

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

apo pushed a commit to branch master
in repository libapache-mod-jk.

commit 08e35b7250c1478efc4b9234e24cd7d065383500
Author: Charles Fry <cfry at debian.org>
Date:   Mon Jan 9 18:44:54 2006 +0000

    set mergeWithUpstream=1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libapache-mod-jk.git