[Bf-blender-cvs] [7b7503a] gooseberry: Merge branch 'master' into gooseberry

[Antony Riakiotakis]

Commit: 7b7503a6abdeb108c308c260c0636f9d01c7e15c
Author: Antony Riakiotakis
Date:   Fri Jun 12 15:30:36 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB7b7503a6abdeb108c308c260c0636f9d01c7e15c

Merge branch 'master' into gooseberry

Conflicts:
	source/blender/editors/space_clip/clip_draw.c
	source/blender/imbuf/intern/anim_movie.c
	source/blender/windowmanager/intern/wm_playanim.c

===================================================================



===================================================================