Merge remote-tracking branch 'stevee/proxy-squidclamav' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 15 Jul 2013 18:49:23 +0000 (20:49 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 15 Jul 2013 18:49:23 +0000 (20:49 +0200)
commit3e862ce4f99059002b60994addc87a013d298b38
treed24f49b6b76ef253150c1e77f87117bfefca868d
parentf9dec458f39323bead4686f9e1a3bb827a9bd134
parent5ced384b719877abfe0c78d9345a645f4531e38a
Merge remote-tracking branch 'stevee/proxy-squidclamav' into next

Conflicts:
config/cfgroot/general-functions.pl
config/cfgroot/general-functions.pl