merge

.hgtags

BuildParams

doc/contributions.txt

doc/translations.txt

indra/llmessage/lltemplatemessagereader.cpp

indra/llui/llurlentry.cpp

indra/newview/CMakeLists.txt

indra/newview/llfloaterabout.cpp

indra/newview/llfloaterbuyland.cpp

indra/newview/llfloatervoiceeffect.cpp

indra/newview/llfloaterwebcontent.cpp

indra/newview/llfloaterworldmap.cpp

indra/newview/llpanelcontents.cpp

indra/newview/llpanelobjectinventory.cpp

indra/newview/llviewerobject.cpp

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

...ewview/skins/default/xui/de/floater_delete_env_preset.xml

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

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

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