Merges vojo-dev into master and manually resolves conflicts.
authorEdward L Platt <ed@elplatt.com>
Tue, 29 Jan 2013 03:46:50 +0000 (19:46 -0800)
committerEdward L Platt <ed@elplatt.com>
Tue, 29 Jan 2013 03:46:50 +0000 (19:46 -0800)
commit9cd77891fd0ef5f09136c6c68d055c973679ce37
treee829317f27ca69a3499a398e63012feeac9803c8
parent2ecd8bcfb5edebc752973c6af727695c795c5d4f
parent408ea96afee2bc170c32f4fa60a04c3fa5aab2b4
Merges vojo-dev into master and manually resolves conflicts.
157 files changed:
.gitignore
.gitmodules
html/sites/all/modules/contrib/features/LICENSE.txt
html/sites/all/modules/contrib/flag/README.txt
html/sites/all/modules/contrib/flag/flag_actions.install
html/sites/all/modules/contrib/flag/includes/flag.token.inc
html/sites/all/modules/contrib/flag/includes/flag.views_bookmark.inc
html/sites/all/modules/contrib/flag/includes/flag_handler_argument_content_id.inc
html/sites/all/modules/contrib/flag/includes/flag_handler_field_ops.inc
html/sites/all/modules/contrib/flag/theme/README.txt
html/sites/all/modules/contrib/flag/theme/flag-admin.css
html/sites/all/modules/contrib/flag/theme/flag-admin.js
html/sites/all/modules/contrib/flag/theme/flag.js
html/sites/all/modules/contrib/flag/theme/flag.tpl.php
html/sites/all/modules/contrib/openlayers/CHANGELOG.txt
html/sites/all/modules/contrib/openlayers/README.txt
html/sites/all/modules/contrib/openlayers/docs/API.txt
html/sites/all/modules/contrib/openlayers/docs/BEHAVIORS.txt
html/sites/all/modules/contrib/openlayers/docs/CUSTOMIZATION.txt
html/sites/all/modules/contrib/openlayers/docs/IE.txt
html/sites/all/modules/contrib/openlayers/docs/JAVASCRIPT.txt
html/sites/all/modules/contrib/openlayers/docs/KML.txt
html/sites/all/modules/contrib/openlayers/docs/LAYER_TYPES.txt
html/sites/all/modules/contrib/openlayers/docs/OPENLAYERS_VIEWS.txt
html/sites/all/modules/contrib/openlayers/docs/RAW_LAYERS.txt
html/sites/all/modules/contrib/openlayers/docs/STYLE_PLUGINS.txt
html/sites/all/modules/contrib/openlayers/docs/openlayers.api.php
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_argparser.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_attribution.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_boxselect.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_cluster.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_dragpan.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_drawfeatures.css
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_drawfeatures.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_fullscreen.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_keyboarddefaults.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_layerswitcher.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_mapformvalues.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_mouseposition.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_navigation.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_panzoom.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_panzoombar.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_permalink.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_popup.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_scaleline.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_tooltip.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_zoombox.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_zoompanel.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_zoomtolayer.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/js/openlayers_behavior_zoomtomaxextent.js
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_argparser.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_attribution.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_boxselect.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_cluster.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_dragpan.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_drawfeatures.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_fullscreen.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_keyboarddefaults.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_layerswitcher.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_mapformvalues.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_mouseposition.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_navigation.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_overviewmap.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_panzoom.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_panzoombar.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_permalink.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_popup.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_scaleline.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_tooltip.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_zoombox.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_zoompanel.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_zoomtolayer.inc
html/sites/all/modules/contrib/openlayers/includes/behaviors/openlayers_behavior_zoomtomaxextent.inc
html/sites/all/modules/contrib/openlayers/includes/layer_types/cloudmade.inc
html/sites/all/modules/contrib/openlayers/includes/layer_types/google.inc
html/sites/all/modules/contrib/openlayers/includes/layer_types/js/cloudmade.js
html/sites/all/modules/contrib/openlayers/includes/layer_types/js/google.js
html/sites/all/modules/contrib/openlayers/includes/layer_types/js/kml.js
html/sites/all/modules/contrib/openlayers/includes/layer_types/js/maptiler.js
html/sites/all/modules/contrib/openlayers/includes/layer_types/js/osm.js
html/sites/all/modules/contrib/openlayers/includes/layer_types/js/raw.js
html/sites/all/modules/contrib/openlayers/includes/layer_types/js/tms.js
html/sites/all/modules/contrib/openlayers/includes/layer_types/js/vector.js
html/sites/all/modules/contrib/openlayers/includes/layer_types/js/virtualearth.js
html/sites/all/modules/contrib/openlayers/includes/layer_types/js/wms.js
html/sites/all/modules/contrib/openlayers/includes/layer_types/js/xyz.js
html/sites/all/modules/contrib/openlayers/includes/layer_types/js/yahoo.js
html/sites/all/modules/contrib/openlayers/includes/layer_types/kml.inc
html/sites/all/modules/contrib/openlayers/includes/layer_types/maptiler.inc
html/sites/all/modules/contrib/openlayers/includes/layer_types/osm.inc
html/sites/all/modules/contrib/openlayers/includes/layer_types/raw.inc
html/sites/all/modules/contrib/openlayers/includes/layer_types/tms.inc
html/sites/all/modules/contrib/openlayers/includes/layer_types/virtualearth.inc
html/sites/all/modules/contrib/openlayers/includes/layer_types/wms.inc
html/sites/all/modules/contrib/openlayers/includes/layer_types/xyz.inc
html/sites/all/modules/contrib/openlayers/includes/layer_types/yahoo.inc
html/sites/all/modules/contrib/openlayers/includes/openlayers.behaviors.inc
html/sites/all/modules/contrib/openlayers/includes/openlayers.layer_types.inc
html/sites/all/modules/contrib/openlayers/includes/openlayers.layers.inc
html/sites/all/modules/contrib/openlayers/includes/openlayers.presets.inc
html/sites/all/modules/contrib/openlayers/includes/openlayers.render.inc
html/sites/all/modules/contrib/openlayers/includes/openlayers.styles.inc
html/sites/all/modules/contrib/openlayers/includes/openlayers.theme.inc
html/sites/all/modules/contrib/openlayers/js/openlayers.js
html/sites/all/modules/contrib/openlayers/modules/openlayers_cck/includes/behaviors/js/openlayers_cck_vector_layer.js
html/sites/all/modules/contrib/openlayers/modules/openlayers_cck/includes/behaviors/openlayers_cck_vector_layer.inc
html/sites/all/modules/contrib/openlayers/modules/openlayers_cck/includes/openlayers_cck.feeds.inc
html/sites/all/modules/contrib/openlayers/modules/openlayers_cck/includes/openlayers_cck.generate.inc
html/sites/all/modules/contrib/openlayers/modules/openlayers_cck/includes/openlayers_cck.theme.inc
html/sites/all/modules/contrib/openlayers/modules/openlayers_cck/includes/openlayers_cck_map.tpl.php
html/sites/all/modules/contrib/openlayers/modules/openlayers_cck/js/openlayers_cck.js
html/sites/all/modules/contrib/openlayers/modules/openlayers_cck/openlayers_cck.info
html/sites/all/modules/contrib/openlayers/modules/openlayers_cck/openlayers_cck.install
html/sites/all/modules/contrib/openlayers/modules/openlayers_cck/openlayers_cck.module
html/sites/all/modules/contrib/openlayers/modules/openlayers_cck/tests/openlayers_cck.test
html/sites/all/modules/contrib/openlayers/modules/openlayers_filters/openlayers_filters.info
html/sites/all/modules/contrib/openlayers/modules/openlayers_filters/openlayers_filters.module
html/sites/all/modules/contrib/openlayers/modules/openlayers_filters/tests/openlayers_filters.test
html/sites/all/modules/contrib/openlayers/modules/openlayers_ui/includes/openlayers_ui.admin.inc
html/sites/all/modules/contrib/openlayers/modules/openlayers_ui/includes/openlayers_ui.layers.inc
html/sites/all/modules/contrib/openlayers/modules/openlayers_ui/includes/openlayers_ui.presets.inc
html/sites/all/modules/contrib/openlayers/modules/openlayers_ui/includes/openlayers_ui.styles.inc
html/sites/all/modules/contrib/openlayers/modules/openlayers_ui/includes/openlayers_ui.theme.inc
html/sites/all/modules/contrib/openlayers/modules/openlayers_ui/js/openlayers_ui.presets.js
html/sites/all/modules/contrib/openlayers/modules/openlayers_ui/openlayers_ui.css
html/sites/all/modules/contrib/openlayers/modules/openlayers_ui/openlayers_ui.info
html/sites/all/modules/contrib/openlayers/modules/openlayers_ui/openlayers_ui.install
html/sites/all/modules/contrib/openlayers/modules/openlayers_ui/openlayers_ui.module
html/sites/all/modules/contrib/openlayers/modules/openlayers_views/includes/layer_types/openlayers_views_vector.inc
html/sites/all/modules/contrib/openlayers/modules/openlayers_views/includes/layer_types/openlayers_views_vector.js
html/sites/all/modules/contrib/openlayers/modules/openlayers_views/includes/openlayers_views.theme.inc
html/sites/all/modules/contrib/openlayers/modules/openlayers_views/openlayers_views.info
html/sites/all/modules/contrib/openlayers/modules/openlayers_views/openlayers_views.install
html/sites/all/modules/contrib/openlayers/modules/openlayers_views/openlayers_views.module
html/sites/all/modules/contrib/openlayers/modules/openlayers_views/views/openlayers-views-map.tpl.php
html/sites/all/modules/contrib/openlayers/modules/openlayers_views/views/openlayers_views.views.inc
html/sites/all/modules/contrib/openlayers/modules/openlayers_views/views/openlayers_views.views.theme.inc
html/sites/all/modules/contrib/openlayers/modules/openlayers_views/views/openlayers_views_plugin_display_openlayers.inc
html/sites/all/modules/contrib/openlayers/modules/openlayers_views/views/openlayers_views_style_data.inc
html/sites/all/modules/contrib/openlayers/modules/openlayers_views/views/openlayers_views_style_map.inc
html/sites/all/modules/contrib/openlayers/openlayers.css
html/sites/all/modules/contrib/openlayers/openlayers.info
html/sites/all/modules/contrib/openlayers/openlayers.install
html/sites/all/modules/contrib/openlayers/openlayers.module
html/sites/all/modules/contrib/openlayers/tests/js/harness.js
html/sites/all/modules/contrib/openlayers/tests/openlayers.test
html/sites/all/modules/contrib/openlayers/tests/openlayers_test.info
html/sites/all/modules/contrib/openlayers/tests/openlayers_test.install
html/sites/all/modules/contrib/openlayers/tests/openlayers_test.module
html/sites/all/modules/contrib/openlayers/tests/plugins/style_plugin/openlayers_test_rnd_factor.inc
html/sites/all/modules/contrib/openlayers/tests/plugins/style_plugin/openlayers_test_rnd_factor.js
html/sites/all/modules/contrib/openlayers/tests/plugins/style_plugin/openlayers_test_rnd_int.inc
html/sites/all/modules/contrib/openlayers/tests/plugins/style_plugin/openlayers_test_rnd_int.js
html/sites/all/modules/contrib/strongarm/README.txt
html/sites/all/modules/contrib/strongarm/strongarm.css
html/sites/all/modules/features/vozmob_og/vozmob_og.features.inc
html/sites/all/modules/patched/mailsave/cleanup/mms_us_verizon/mms_us_verizon.inc