]> 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: c1fa1b2 e8b2558)
Merge remote-tracking branch 'maniacikarus/proxy'
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 31 Oct 2011 12:32:23 +0000 (13:32 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 31 Oct 2011 12:32:23 +0000 (13:32 +0100)

Trivial merge
IPFire 3.x development tree