svn merge -r121194:121210

doc/contributions.txt

indra/llcharacter/lleditingmotion.cpp

indra/llcommon/llapr.cpp

indra/llcommon/llapr.h

indra/llcommon/lldate.h

indra/llcommon/llerror.cpp

indra/llcommon/llversionviewer.h

indra/llui/llmenugl.cpp

indra/llui/llmenugl.h

indra/llui/llnotifications.cpp

indra/llui/llpanel.cpp

indra/llwindow/lldxhardware.cpp

indra/llxml/llcontrol.cpp

indra/newview/app_settings/settings.xml

indra/newview/character/avatar_lad.xml

indra/newview/installers/windows/lang_nl.nsi

indra/newview/linux_tools/launch_url.sh

indra/newview/llagent.cpp

indra/newview/llappviewer.cpp

indra/newview/llappviewermacosx.cpp