Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 11 Apr 2014 13:18:50 +0000 (15:18 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 11 Apr 2014 13:18:50 +0000 (15:18 +0200)
commitb04a34188c8456a81c8fef0064014b8aeb584ee4
tree14371324e0c2e1bd689357df28d8dd7b0f84c63d
parentae6ae33f847ea063331b8ce205148334925385fd
parent21674d364b670dbc133f085474b0ee92c1862975
Merge branch 'master' into next

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
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl