]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a409c36 1eaa29b)
Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 1 Jun 2011 11:53:05 +0000 (13:53 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 1 Jun 2011 11:53:05 +0000 (13:53 +0200)
1  2 
langs/de/cgi-bin/de.pl patch | diff1 | diff2 | blob | history

diff --cc langs/de/cgi-bin/de.pl
Simple merge
Timo's tree of IPFire 2.x