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

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: d55fbf7 3765eb6)

author	Michael Tremer <michael.tremer@ipfire.org>
	Mon, 19 Aug 2013 11:27:16 +0000 (13:27 +0200)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Mon, 19 Aug 2013 11:27:16 +0000 (13:27 +0200)
commit	cfc8efa2f5a42a391bb6dfb320181bcc61f722e4
tree	30cac2a9ec4645f5ad684d7ed173ec74395b72fe	tree
parent	d55fbf75a88cfa6fdc3b4be815f29306cf35f505	commit \| diff
parent	3765eb6179d721093c834e3483fdef8232b5b486	commit \| diff

Merge branch 'next' into firewall

Conflicts:
src/initscripts/init.d/tor

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
langs/de/cgi-bin/de.pl	diff1 \|	diff2 \|	blob \| history
langs/en/cgi-bin/en.pl	diff1 \|	diff2 \|	blob \| history
src/initscripts/init.d/tor	diff1 \|	diff2 \|	blob \| history

Michael's tree of IPFire 2.x.