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

Simple merge
Simple merge