Merge

doc/contributions.txt

indra/cmake/TemplateCheck.cmake

indra/cmake/Variables.cmake

indra/llcharacter/lljoint.h

indra/llcommon/llfasttimer.h

indra/llcommon/llfasttimer_class.cpp

indra/llcommon/llmemory.h

indra/llinventory/llinventory.cpp

indra/llrender/llgl.cpp

indra/llrender/llgl.h

indra/llrender/llglheaders.h

indra/llrender/llrendertarget.cpp

indra/llui/llcombobox.cpp

indra/newview/app_settings/high_graphics.xml

indra/newview/app_settings/low_graphics.xml

indra/newview/app_settings/mid_graphics.xml

indra/newview/app_settings/settings.xml

...w/app_settings/shaders/class1/deferred/postDeferredF.glsl

indra/newview/app_settings/ultra_graphics.xml

indra/newview/featuretable.txt