merge

indra/llcommon/llsdserialize.cpp

indra/llcommon/llstring.h

indra/newview/llgroupmgr.cpp

indra/newview/llnotificationhandlerutil.cpp

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

...ewview/skins/default/xui/da/panel_preferences_general.xml

...a/newview/skins/default/xui/en/panel_preferences_chat.xml

...ewview/skins/default/xui/en/panel_preferences_general.xml

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

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

...a/newview/skins/default/xui/fr/panel_preferences_chat.xml

...ewview/skins/default/xui/fr/panel_preferences_general.xml

...a/newview/skins/default/xui/it/panel_preferences_chat.xml

...ewview/skins/default/xui/it/panel_preferences_general.xml

...ewview/skins/default/xui/nl/panel_preferences_general.xml

...a/newview/skins/default/xui/pl/panel_preferences_chat.xml

...ewview/skins/default/xui/pl/panel_preferences_general.xml