From: Arne Fitzenreiter Date: Sat, 11 Jun 2011 22:01:26 +0000 (+0200) Subject: Merge branch 'master' into next X-Git-Tag: v2.9-core53~95 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=1afed8d21d28aa498beef8fb29932754259eb556;hp=-c Merge branch 'master' into next --- 1afed8d21d28aa498beef8fb29932754259eb556 diff --combined config/rootfiles/oldcore/48/exclude index 6fe46b4c89,ce199d8511..ce199d8511 --- a/config/rootfiles/oldcore/48/exclude +++ b/config/rootfiles/oldcore/48/exclude @@@ -1,1 -1,1 +1,1 @@@ - /srv/web/ipfire/html/proxy.pac + srv/web/ipfire/html/proxy.pac