merge

.hgtags

BuildParams

indra/llcommon/llversionviewer.h

indra/llmessage/tests/commtest.h

indra/llmessage/tests/test_llsdmessage_peer.py

indra/llmessage/tests/testrunner.py

indra/newview/skins/default/xui/da/floater_about_land.xml

indra/newview/skins/default/xui/da/floater_env_settings.xml

indra/newview/skins/default/xui/de/floater_about_land.xml

indra/newview/skins/default/xui/en/floater_sell_land.xml

indra/newview/skins/default/xui/es/floater_about.xml

indra/newview/skins/default/xui/es/floater_about_land.xml

indra/newview/skins/default/xui/es/floater_buy_contents.xml

...a/newview/skins/default/xui/es/floater_import_collada.xml

...ew/skins/default/xui/es/floater_inventory_view_finder.xml

indra/newview/skins/default/xui/es/floater_model_preview.xml

indra/newview/skins/default/xui/es/floater_model_wizard.xml

...ewview/skins/default/xui/es/floater_price_for_listing.xml

indra/newview/skins/default/xui/es/floater_sound_devices.xml

indra/newview/skins/default/xui/es/floater_tools.xml