From: Gerd von Egidy Date: Mon, 11 May 2009 15:39:51 +0000 (+0200) Subject: Merge branch 'master' into squid-v3 X-Git-Tag: v2.6~120^2 X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=3827a396ecba840e4f104637cddfe5cebfe276b6;p=libi2ncommon Merge branch 'master' into squid-v3 Conflicts: libcnfcheck/src/check_var/cnfcheck_proxy.cpp libcnfcheck/src/check_var/cnfcheck_system.cpp libfirewall/src/fw_ruleset_obj.cpp libfirewall/src/fw_ruleset_obj.hxx packages/squid/squid.spec --- 3827a396ecba840e4f104637cddfe5cebfe276b6