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)
commita806976e3618736e9054043eae2eb8e65e2bc626
treea2abd2256042484fdba6b2a5dc67ea9991aa0a91
parentad6b3bd660bf8ecce28c4a289dc0d4b367b4376f
parent2269b89ba922ab92005f8502a8b12c8cb1842f37
Merge branch 'master' into next
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
langs/es/cgi-bin/es.pl
langs/fr/cgi-bin/fr.pl