]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commit
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)
commit8bb5e0ba399f5b565b38facdc832ff16fea9ac31
tree870e145249aabb65a8da6ec4648c129ba8ccbeae
parentda8a3136a6db1ff3a30bf119e7b4ad250815fcf7
parent9dd56eb955340c06f4072bd4f8c28001b0b95fdf
Merge remote-tracking branch 'maniacikarus/proxy'