]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 627fdda 1c4308c)
Merge remote-tracking branch 'teissler/bug_10535' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Sep 2014 21:00:05 +0000 (23:00 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Sep 2014 21:00:05 +0000 (23:00 +0200)
1  2 
html/cgi-bin/urlfilter.cgi patch | diff1 | diff2 | blob | history

diff --cc html/cgi-bin/urlfilter.cgi
Simple merge
IPFire 2.x development tree