Merge branch 'master' of git://git.openttd.org/openttd/trunk
Merge branch 'master' into capacities
Merge branch 'capacities' into components
add multimap to branch hierarchy
Merge branch 'master' of git://git.openttd.org/openttd/trunk
Merge branch 'master' into capacities
Merge branch 'capacities' into components
don't produce overflows so easily when calculating the collective signum of a and b
Merge branch 'master' of git://git.openttd.org/openttd/trunk
Merge branch 'master' into capacities
Merge branch 'capacities' into components
add set saveloading to branch hierarchy
Merge branch 'master' of git://git.openttd.org/openttd/trunk
Merge branch 'master' into capacities
Merge branch 'capacities' into components
also push slset
Merge branch 'master' into capacities
Merge branch 'capacities' into components
Merge branch 'master' of git://git.openttd.org/openttd/trunk
Merge branch 'master' into capacities