Merge remote-tracking branch 'ms/squid-ad' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 27 Jul 2014 10:01:50 +0000 (12:01 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 27 Jul 2014 10:01:50 +0000 (12:01 +0200)
commit2deb75c0f3ee968c6298689bcac2110cb12027fe
treeedbbfa50547101de40def470903ca27885a86799
parentbb5902b6f41801a7fcc09f61827388894eee18b0
parent889219356ebe78cc59e682ae0bd2fad4a8b0a95e
Merge remote-tracking branch 'ms/squid-ad' into next
17 files changed:
config/rootfiles/common/armv5tel/initscripts
config/rootfiles/common/i586/initscripts
doc/language_issues.de
doc/language_issues.en
doc/language_issues.es
doc/language_issues.fr
doc/language_issues.nl
doc/language_issues.pl
doc/language_issues.ru
doc/language_issues.tr
doc/language_missings
html/cgi-bin/proxy.cgi
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
langs/tr/cgi-bin/tr.pl
lfs/samba
make.sh