From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 30 Dec 2013 22:06:52 +0000 (-0800)
Subject: Merge from sbuf-tokenizer
X-Git-Tag: merge-candidate-3-v1~506^2~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a8a27fca3ec08591aa133b3736a168366dc18ab;p=thirdparty%2Fsquid.git

Merge from sbuf-tokenizer
---

8a8a27fca3ec08591aa133b3736a168366dc18ab