Trivial commit
Merge branch 'master' of github.com:jamespetts/simutrans-pak128.britain
CHANGE: Add simuconf.tab entry for special_building_distance in preparation for merge with Standard
CHANGE: Updated ironworks (W. Lindley)
CHANGE: Bring the price and maintenance cost of the aqueduct into line with that of the rail viaduct.
CHANGE: Adjust local/midrange/longdistance routing chances based on real data, and alter journey time tolerances accordingly
CHANGE: Increase the maximum long distance tolerance
CHANGE: Greatly increase the loading time of the stage coach, so as to make it unsuitable for short-haul traffic.
CHANGE: Increase the loading times of the mail and parcel coach
CHANGE: Put back the retirement of the mail coach until the parcel coach is availble.
CHANGE: Reduce capacity of the staging inn from 100 to 40
ADD: A few more street/stop names
ADD: New street/stop names
Merge branch 'master' of git://github.com/calvin-fisher/simutrans-pak128.britain.git

Conflicts:
	Pak128.Britain-Experimental.suo
	bus/mailcoach.dat
ADD: Documentation on balancing ships (TygerFish)
FIX: Missing translation text for the Mersey Ferry
Initial ship changes for hull/hold model
ADD: Simutrans Fried Chicken
CHANGE: Reduce the chance and increase the level of the 1800 terraces
CODE: More accurte comments in simuconf.tab
CODE: Add towns_adopt_player_roads=1 simuconf.tab setting in preparation for next version
ADD: Wrought iron goods type (without loaded vehicle graphics for the time being - from Standard). This is supplied to builders' merchants in the 18th and early 19th centuries.
CODE: Rename .dat file for the ironworks
CHANGE: Increase the distributionweight of the early hardware shop
ADD: Snow images for the ironworks (W. Lindley - from Standard)
ADD: A few more street/stop names
ADD: Ungated narrow gauge crossing (from Standard)
CHANGE: Modification to the electrification removal tools (based on Standard)
FIX: Minor graphical anomaly with the messages button (was 2 pixels too high)
ADD: Rail one way sign (The Hood - from Standard)
ADD: Power line tunnels (currently with incomplete graphics - from Standard)
CHANGE: Improved way graphics and preparation for half height slopes (Kieron, from Standard)
Merge branch 'holdships' of git://github.com/calvin-fisher/simutrans-pak128.britain.git into water-transport-overhaul

Conflicts:
	text/en.tab
REVERT: Changes to parameter.mos
CODE: Update project file for new boats
FIX: Builder's yard graphic