Merge remote-tracking branch 'remotes/spaetz/410_OSM_attrib_v2'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 26 Nov 2012 17:53:59 +0000 (11:53 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 26 Nov 2012 17:53:59 +0000 (11:53 -0600)
commit11e887f2743b9a362708635a502a8867d757e8c6
treef4d615be860da73ed115da9c0c3c2848c15aed0e
parent9abd664bf2b1de34fc6de0f3b323727e47470e52
parentee97ac6c2f8629aee958391f1f6337b1983529d0
Merge remote-tracking branch 'remotes/spaetz/410_OSM_attrib_v2'