]> 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: da8a313 9dd56eb)
Merge remote-tracking branch 'maniacikarus/proxy'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 28 Apr 2012 12:32:58 +0000 (14:32 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 28 Apr 2012 12:32:58 +0000 (14:32 +0200)

Trivial merge
Alex's tree of IPFire 3.x