]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 5 Sep 2011 18:35:02 +0000 (20:35 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 5 Sep 2011 18:35:02 +0000 (20:35 +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
langs/pl/cgi-bin/pl.pl

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge