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)
commitb751ad81814bd71d9ddf32607c992dbbddfd417c
tree7ae8e58e766030c0d84267f32f650290f703a72c
parent5532265c3ca1c01cd0a2d3b2a893b5fbac606faa
parentad8cad552baa2561f7c8cacc52ae14242a36abfb
Merge branch 'master' into next
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl