pnorman/openstreetmap-carto — pull request #4 by math1985 (2014-10-04 22:08:13+00:00)
Title: Repair broken merge and merge again

* Repair broken merge fc88e97
* Fix changes up to 555c868