Blender Git Commit Log

Merge branch 'master' of git://git.blender.org/blender

# Conflicts:
# source/blender/editors/space_view3d/drawmesh.c
# source/blender/gpu/GPU_extensions.h
# source/blender/gpu/SConscript
# source/blender/gpu/intern/gpu_compositing.c
# source/blender/gpu/intern/gpu_extensions.c
# source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp