]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Mar 2014 22:14:13 +0000 (23:14 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Mar 2014 22:14:13 +0000 (23:14 +0100)
Conflicts:
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


No differences found