svn merge -r124872:124873

doc/contributions.txt

indra/llcommon/llversionviewer.h

indra/llcrashlogger/llcrashlogger.cpp

indra/llrender/llimagegl.cpp

indra/llrender/llimagegl.h

indra/llui/llview.cpp

indra/newview/app_settings/settings.xml

indra/newview/da.lproj/language.txt

indra/newview/es.lproj/language.txt

indra/newview/featuretable.txt

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/fr.lproj/language.txt

indra/newview/hu.lproj/language.txt

indra/newview/installers/windows/lang_fr.nsi

indra/newview/it.lproj/language.txt

indra/newview/linux_tools/wrapper.sh

indra/newview/llagent.cpp

indra/newview/llappviewer.cpp

indra/newview/llappviewermacosx.cpp