]> git.ipfire.org Git - people/pmueller/ipfire-3.x.git/commit
Merge remote-tracking branch 'maniacikarus/proxy'
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 27 Apr 2012 18:30:22 +0000 (20:30 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 27 Apr 2012 18:30:22 +0000 (20:30 +0200)
commit92d120f24d331a364c4314b8cb7d2faabc389c0d
tree0e036090dae2986f8ff0c8b0b71d6ee1c9e74edf
parentba282f01d6ae8112fb41bd3f500bcf1fa188c945
parentfb8afaf00a83fcd489c250d6fa4101528377c57d
Merge remote-tracking branch 'maniacikarus/proxy'