[Merge] lp:~noskcaj/ubuntu/saucy/squid3/Merge-3.3.4 into lp:ubuntu/saucy-proposed/squid3

[Jackson Doak]

Jackson Doak has proposed merging lp:~noskcaj/ubuntu/saucy/squid3/Merge-3.3.4 into lp:ubuntu/saucy-proposed/squid3.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)
Related bugs:
  Bug #1175049 in squid3 (Ubuntu): "Please merge squid3 3.3.3-2 (main) from Debian unstable (main)"
  https://bugs.launchpad.net/ubuntu/+source/squid3/+bug/1175049

For more details, see:
https://code.launchpad.net/~noskcaj/ubuntu/saucy/squid3/Merge-3.3.4/+merge/174099

Merged from debian. I think i've done the conflicts wrong, can someone test this?
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~noskcaj/ubuntu/saucy/squid3/Merge-3.3.4/+merge/174099
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~noskcaj/ubuntu/saucy/squid3/Merge-3.3.4 into lp:ubuntu/saucy-proposed/squid3.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 524288 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20130711/077a8420/attachment-0001.diff>