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: c80303c a257ce6)

author	Michael Tremer <michael.tremer@ipfire.org>
	Thu, 8 May 2014 23:31:43 +0000 (01:31 +0200)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Thu, 8 May 2014 23:31:43 +0000 (01:31 +0200)
commit	03d0b8c7e8486fca41674ddac51543edad300f4d
tree	9f1064904de512dbc98a15c773e13612d5ab365c	tree \| snapshot
parent	c80303cd452f8d6b41a4039e357d30b0ece19843	commit \| diff
parent	a257ce6b8dab0186455692f847c4dc6517198062	commit \| diff

Merge branch 'master' into next

Conflicts:
doc/language_issues.nl
doc/language_issues.tr

13 files changed:

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/pppsetup.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
make.sh	diff1 \|	diff2 \|	blob \| history

IPFire 2.x development tree