Merge remote-tracking branch 'ms/modem-status' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 21 Apr 2014 12:02:17 +0000 (14:02 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 21 Apr 2014 12:02:17 +0000 (14:02 +0200)
commitc80303cd452f8d6b41a4039e357d30b0ece19843
treedc8c2ed16bf17978244f4df15ca36c62d43adf4e
parent1d3c37402c4684e682aabe904f443b93b6dc4310
parentc5e3d520e92aee074f1713f8ba98ee4296341ad3
Merge remote-tracking branch 'ms/modem-status' into next

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