]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk
authorFrancesco Chemolli <kinkie@squid-cache.org>
Tue, 29 Oct 2013 22:36:09 +0000 (23:36 +0100)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Tue, 29 Oct 2013 22:36:09 +0000 (23:36 +0100)
1  2 
src/Makefile.am
src/auth/User.cc
src/auth/User.h

diff --cc src/Makefile.am
Simple merge
Simple merge
diff --cc src/auth/User.h
Simple merge