Merge branch 'next' into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 30 Nov 2013 11:45:31 +0000 (12:45 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 30 Nov 2013 11:45:31 +0000 (12:45 +0100)
commit0037264780e516ef1cd85c1a73b178097b3201d6
tree2ceb24b9d5adda7282fe6af17647ee1b9a718d78
parente99dcbdbab9ae7a301d8a4871c18bc81fe5469c8
parent532b997c65fba44c2c5778fd7622fafe513cc245
Merge branch 'next' into fifteen

Conflicts:
doc/language_issues.tr
doc/language_issues.de
doc/language_issues.en
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