]> 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: e70cb6b 321c867)
Merge remote-tracking branch 'maniacikarus/proxy'
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 1 Apr 2011 13:16:26 +0000 (15:16 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 1 Apr 2011 13:16:26 +0000 (15:16 +0200)

Trivial merge
IPFire 3.x development tree