]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
projects / people / amarx / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86b60ec 93d8354)
Merge remote-tracking branch 'maniacikarus/proxy'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 Apr 2011 13:34:09 +0000 (15:34 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 Apr 2011 13:34:09 +0000 (15:34 +0200)

Trivial merge
Alex's tree of IPFire 3.x