]> 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: 4ad8874 6665a03)
Merge remote-tracking branch 'origin/master' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Jul 2012 21:54:31 +0000 (23:54 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Jul 2012 21:54:31 +0000 (23:54 +0200)
1  2 
html/cgi-bin/services.cgi patch | diff1 | diff2 | blob | history

diff --cc html/cgi-bin/services.cgi
Simple merge
Timo's tree of IPFire 2.x