Merge

.hgtags

indra/llcommon/llavatarname.cpp

indra/llcommon/llavatarname.h

indra/llmessage/llavatarnamecache.cpp

indra/llmessage/llavatarnamecache.h

indra/newview/app_settings/lindenlab.pem

indra/newview/llappviewer.cpp

indra/newview/llimview.cpp

indra/newview/lllogininstance.cpp

indra/newview/llpanellogin.cpp

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

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

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

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

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

...a/newview/skins/default/xui/de/panel_avatar_list_item.xml

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

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

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

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