merge

doc/contributions.txt

indra/llmessage/llassetstorage.cpp

indra/llplugin/llpluginclassmedia.h

indra/llrender/llcubemap.cpp

indra/llrender/llgl.cpp

indra/llrender/llgl.h

indra/llrender/llglheaders.h

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llrender/llimagegl.cpp

indra/llrender/llpostprocess.cpp

indra/llrender/llrender.cpp

indra/llrender/llrender.h

indra/llrender/llrendersphere.cpp

indra/llrender/llrendersphere.h

indra/llrender/llrendertarget.cpp

indra/llrender/llrendertarget.h

indra/llrender/llshadermgr.cpp

indra/llrender/llshadermgr.h

indra/llrender/llvertexbuffer.cpp