gravitystorm/openstreetmap-carto — pull request #894 by math1985 (2014-08-18 22:46:00+00:00)
Title: Render ways with both highway and railway tag

Make sure that ways that have both a highway and a railway tag are rendered
both as highway and railway.

This resolves #874.

This assumes #866 and #884 are merged first.

Thanks to @kkofler.