]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82f8d11 d8cc443)
Merge remote-tracking branch 'amarx/fw-checksubnet' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 26 Sep 2014 10:59:26 +0000 (12:59 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 26 Sep 2014 10:59:26 +0000 (12:59 +0200)
1  2 
html/cgi-bin/fwhosts.cgi patch | diff1 | diff2 | blob | history

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