]> 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: 6bd4bcd abfd82b)
Merge remote-tracking branch 'stevee/squid-zph-qos' into beyond-next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 21 Mar 2014 13:48:22 +0000 (14:48 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 21 Mar 2014 13:48:22 +0000 (14:48 +0100)
1  2 
lfs/squid patch | diff1 | diff2 | blob | history

diff --cc lfs/squid
Simple merge
Timo's tree of IPFire 2.x