Recovering from merge conflicts
Recovering from merge conflicts

pgiraud/openlayers,boundlessgeo/openlayers,shevawen/openlayers,Gnafu/openlayers,shevawen/openlayers,sanak/ol2,owenmead/openlayers,georchestra/openlayers,sanak/ol2,ahocevar/ol2,sanak/ol2,avinet/openlayers,pvalsecc/openlayers,owenmead/openlayers,kartverket/openlayers,adh1365/openlayers,openlayers/ol2,boundlessgeo/openlayers,shevawen/openlayers,avinet/openlayers,PetrDlouhy/openlayers,wet-boew/openlayers,colllin/openlayers,PetrDlouhy/openlayers,PublicStuff/openlayers,altamiracorp/openlayers,kartverket/openlayers,altamiracorp/openlayers,boundlessgeo/openlayers,kartverket/openlayers,PetrDlouhy/openlayers,PublicStuff/openlayers,dracic/openlayers,dracic/openlayers,owenmead/openlayers,avinet/openlayers,v5analytics/openlayers,ahocevar/ol2,v5analytics/openlayers,sbrunner/openlayers,PublicStuff/openlayers,elbakai/openlayers,owenmead/openlayers,pgiraud/openlayers,pvalsecc/openlayers,v5analytics/openlayers,openlayers/ol2,openlayers/ol2,colllin/openlayers,colllin/openlayers,sbrunner/openlayers,colllin/openlayers,openlayers/ol2,ahocevar/ol2,boundlessgeo/openlayers,adh1365/openlayers,georchestra/openlayers,elbakai/openlayers,tschaub/openlayers-raster,shevawen/openlayers,v5analytics/openlayers,pvalsecc/openlayers,georchestra/openlayers,sbrunner/openlayers,adh1365/openlayers,tschaub/openlayers-raster,kartverket/openlayers,altamiracorp/openlayers,sanak/ol2,PublicStuff/openlayers,Gnafu/openlayers,Gnafu/openlayers,wet-boew/openlayers,tschaub/openlayers-raster,dracic/openlayers,pgiraud/openlayers,dracic/openlayers,pgiraud/openlayers,altamiracorp/openlayers,wet-boew/openlayers,PetrDlouhy/openlayers,elbakai/openlayers,pvalsecc/openlayers,Gnafu/openlayers,avinet/openlayers,wet-boew/openlayers,sbrunner/openlayers,adh1365/openlayers,elbakai/openlayers