Merge branch 'master' into squid-v3
authorGerd von Egidy <gerd.von.egidy@intra2net.com>
Mon, 11 May 2009 15:39:51 +0000 (17:39 +0200)
committerGerd von Egidy <gerd.von.egidy@intra2net.com>
Mon, 11 May 2009 15:39:51 +0000 (17:39 +0200)
commit3827a396ecba840e4f104637cddfe5cebfe276b6
tree1074a83cebe9d95bce69b371471231e897b0d736
parentae45fb958139c9e74cdb9683835c136fabab8dcd
parent55661be530587aa2f3a3ea74c75d03d815036ade
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