]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Mon, 29 Sep 2008 03:03:47 +0000 (15:03 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Mon, 29 Sep 2008 03:03:47 +0000 (15:03 +1200)
1  2 
errors/sv.po
src/Makefile.am

diff --cc errors/sv.po
Simple merge
diff --cc src/Makefile.am
Simple merge