Merge 1.9.0-beta2

src/station.cpp

@@ -1,4 +1,4 @@
-/* $Id: station.cpp 27178 2015-03-07 18:27:01Z frosch $ */
+/* $Id$ */
 
 /*
  * This file is part of OpenTTD.
@@ -36,9 +36,6 @@
 StationPool _station_pool("Station");
 INSTANTIATE_POOL_METHODS(Station)
 
-typedef StationIDStack::SmallStackPool StationIDStackPool;
-template<> StationIDStackPool StationIDStack::_pool = StationIDStackPool();
-
 BaseStation::~BaseStation()
 {
 	free(this->name);