Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 8 May 2014 23:31:43 +0000 (01:31 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 8 May 2014 23:31:43 +0000 (01:31 +0200)
commit03d0b8c7e8486fca41674ddac51543edad300f4d
tree9f1064904de512dbc98a15c773e13612d5ab365c
parentc80303cd452f8d6b41a4039e357d30b0ece19843
parenta257ce6b8dab0186455692f847c4dc6517198062
Merge branch 'master' into next

Conflicts:
doc/language_issues.nl
doc/language_issues.tr
13 files changed:
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
html/cgi-bin/pppsetup.cgi
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
make.sh