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

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

projects / ipfire-2.x.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 30156b0 eb95ce8)

author	Michael Tremer <michael.tremer@ipfire.org>
	Wed, 28 Aug 2013 09:33:20 +0000 (11:33 +0200)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Wed, 28 Aug 2013 09:33:20 +0000 (11:33 +0200)
commit	2ac39db92e9b6117d64940f8b0572a24afa07b33
tree	6058a5fc406674e8a90b9da79b0277916665e945	tree \| snapshot
parent	30156b054ef332d8b1ece6fc5d9e0cdbc947ca14	commit \| diff
parent	eb95ce89a8effefa0c6aa27bf6f048926d21fed0	commit \| diff

Merge remote-tracking branch 'amarx/firewall' into fifteen

config/cfgroot/header.pl	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/ovpnmain.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

IPFire 2.x development tree