Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 27 Jun 2011 22:49:44 +0000 (00:49 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 27 Jun 2011 22:49:44 +0000 (00:49 +0200)
1  2 
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl

Simple merge
Simple merge