Merge remote-tracking branch 'stevee/dnsforward' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 15 Jul 2013 18:38:27 +0000 (20:38 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 15 Jul 2013 18:38:27 +0000 (20:38 +0200)
commitc47f57d4e73f04da8a57f5f90fd3bb0ab8e9170a
tree06337161779233ecdae90e0dcd43ee9e0a3ed9f5
parent774df2479dfc7f1dba314da193d62bf828bb9edf
parente4ba53ed590428632025982d0dbd7af9b4e71084
Merge remote-tracking branch 'stevee/dnsforward' into next
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl