Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 24 Jun 2011 09:10:13 +0000 (11:10 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 24 Jun 2011 09:10:13 +0000 (11:10 +0200)
1  2 
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
langs/es/cgi-bin/es.pl
langs/fr/cgi-bin/fr.pl

Simple merge
Simple merge
Simple merge
Simple merge