Merge remote-tracking branch 'origin/master' into next

This commit is contained in:
Arne Fitzenreiter
2015-04-14 20:26:21 +02:00
12 changed files with 35 additions and 7 deletions

View File

@@ -1021,6 +1021,9 @@ WARNING: untranslated string: urlfilter redirect template
WARNING: untranslated string: vendor
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: vpn statistic n2n
WARNING: untranslated string: vpn statistic rw
WARNING: untranslated string: vpn statistics n2n
WARNING: untranslated string: wlan client
WARNING: untranslated string: wlan client advanced settings
WARNING: untranslated string: wlan client and