Merge

.hgtags

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/settings_per_account.xml

indra/newview/llstartup.cpp

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

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

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

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

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

.../newview/skins/default/xui/de/floater_script_ed_prefs.xml

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

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

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

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

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

indra/newview/skins/default/xui/de/menu_object.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_facebook_account.xml

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