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

[Markus Koschany]

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

apo pushed a commit to annotated tag debian/RELEASE_1_2_5-2
in repository libapache-mod-jk.

commit b8a56cc2de1b24d0d3db0c2ea80ac7ad1f95ac7c
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