1
0
Fork 0

Merge branch 'master' into Work

This commit is contained in:
Vivian Meazza 2010-09-03 23:06:30 +01:00
commit 135822ac2a

View file

@ -597,7 +597,9 @@ Started September 2000 by David Megginson, david@megginson.com
<traffic-manager> <traffic-manager>
<enabled type="bool">true</enabled> <enabled type="bool">true</enabled>
<heuristics type="bool">true</heuristics> <heuristics type="bool">true</heuristics>
<datafile type="string"></datafile>
<instantaneous-action type="bool">false</instantaneous-action> <instantaneous-action type="bool">false</instantaneous-action>
<dumpdata type="bool">false</dumpdata>
<proportion>1.0</proportion> <proportion>1.0</proportion>
</traffic-manager> </traffic-manager>