Leith Bade 63e4c75275 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into chrono ...

Conflicts:
	ios/mapbox-gl-cocoa

2015-02-04 10:44:57 +11:00

..

mapbox-gl-cocoa @ 905bca9394

Merge branch 'master' of github.com:mapbox/mapbox-gl-native into chrono

2015-02-04 10:44:57 +11:00