merge

doc/contributions.txt

indra/newview/app_settings/settings.xml

indra/newview/llcofwearables.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llpanellandmarks.cpp

indra/newview/llpanelplaces.cpp

indra/newview/llviewermessage.cpp

indra/newview/llviewertexturelist.cpp

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

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

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

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

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

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

...newview/skins/default/xui/da/menu_inspect_avatar_gear.xml

...a/newview/skins/default/xui/da/menu_inspect_self_gear.xml

...view/skins/default/xui/da/menu_inventory_gear_default.xml

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

.../newview/skins/default/xui/da/menu_places_gear_folder.xml