]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commit
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)
commitab63584d8f833254c3d6d50c1bc3ce9cf32b043e
treebf6c4ab9fec534492a0ba2a2c35a5688a479544b
parentc1fa1b26fdbd4e471e6a717a3c2cf014ce5cbcee
parente8b2558d4ad1be0ff810760ab39583ddf321f2b7
Merge remote-tracking branch 'maniacikarus/proxy'