]> git.ipfire.org Git - people/arne_f/ipfire-3.x.git/commitdiff
projects / people / arne_f / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67d1041 0d1be6a)
Merge remote-tracking branch 'maniacikarus/proxy'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 2 Apr 2011 18:12:27 +0000 (20:12 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 2 Apr 2011 18:12:27 +0000 (20:12 +0200)

Trivial merge
Arne's tree of IPFire 3.x.