Merge

doc/contributions.txt

indra/cmake/FMOD.cmake

indra/llaudio/CMakeLists.txt

indra/llaudio/llvorbisencode.cpp

indra/llaudio/llvorbisencode.h

indra/llmessage/llcachename.cpp

indra/llmessage/llcachename.h

indra/llrender/llgl.cpp

indra/llrender/llgl.h

indra/llrender/llglheaders.h

indra/llui/llmenubutton.cpp

indra/llui/llmenubutton.h

indra/llui/lltextbase.cpp

indra/llui/lltoggleablemenu.cpp

indra/llui/lltoggleablemenu.h

indra/llui/llurlentry.cpp

indra/newview/app_settings/settings.xml

indra/newview/featuretable.txt

indra/newview/featuretable_xp.txt

indra/newview/installers/windows/installer_template.nsi