Blender Git Commit Log

Merge branch 'master' of git.blender.org:blender into cycles_texture_cache

# Conflicts:
# intern/cycles/render/image.cpp
# intern/cycles/render/nodes.cpp
# intern/cycles/render/osl.cpp