git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit

]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit

projects / people / pmueller / ipfire-2.x.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bb5902b 8892193)

author	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 27 Jul 2014 10:01:50 +0000 (12:01 +0200)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 27 Jul 2014 10:01:50 +0000 (12:01 +0200)
commit	2deb75c0f3ee968c6298689bcac2110cb12027fe
tree	edbbfa50547101de40def470903ca27885a86799	tree \| snapshot
parent	bb5902b6f41801a7fcc09f61827388894eee18b0	commit \| diff
parent	889219356ebe78cc59e682ae0bd2fad4a8b0a95e	commit \| diff

Merge remote-tracking branch 'ms/squid-ad' into next

17 files changed:

config/rootfiles/common/armv5tel/initscripts	diff1 \|	diff2 \|	blob \| history
config/rootfiles/common/i586/initscripts	diff1 \|	diff2 \|	blob \| history
doc/language_issues.de	diff1 \|	diff2 \|	blob \| history
doc/language_issues.en	diff1 \|	diff2 \|	blob \| history
doc/language_issues.es	diff1 \|	diff2 \|	blob \| history
doc/language_issues.fr	diff1 \|	diff2 \|	blob \| history
doc/language_issues.nl	diff1 \|	diff2 \|	blob \| history
doc/language_issues.pl	diff1 \|	diff2 \|	blob \| history
doc/language_issues.ru	diff1 \|	diff2 \|	blob \| history
doc/language_issues.tr	diff1 \|	diff2 \|	blob \| history
doc/language_missings	diff1 \|	diff2 \|	blob \| history
html/cgi-bin/proxy.cgi	diff1 \|	diff2 \|	blob \| history
langs/de/cgi-bin/de.pl	diff1 \|	diff2 \|	blob \| history
langs/en/cgi-bin/en.pl	diff1 \|	diff2 \|	blob \| history
langs/tr/cgi-bin/tr.pl	diff1 \|	diff2 \|	blob \| history
lfs/samba	diff1 \|	diff2 \|	blob \| history
make.sh	diff1 \|	diff2 \|	blob \| history

Peter's tree of IPFire 2.x