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)
commit28162d3293a0b33237fda408a79cfe685dd6693a
tree3c7e8197f3982809532b33f447e06d6876dcfb58
parentc75f5126071dec23b877875feb8beb2c6c59de46
parent527a5a7756d2b51f5b226c04bd3cd2ab4c7de45b
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
langs/pl/cgi-bin/pl.pl