]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6855063 145cb4c)
Merge remote branch 'stevee/squid' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 2 May 2010 12:23:28 +0000 (14:23 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 2 May 2010 12:23:28 +0000 (14:23 +0200)

Trivial merge
IPFire 3.x development tree