[Bf-blender-cvs] [889573b] decklink: Merge remote-tracking branch 'origin/master' into decklink

[Benoit Bolsee]

Commit: 889573ba212801124778c0a5a918ba11b779d699
Author: Benoit Bolsee
Date:   Mon Apr 6 23:18:10 2015 +0200
Branches: decklink
https://developer.blender.org/rB889573ba212801124778c0a5a918ba11b779d699

Merge remote-tracking branch 'origin/master' into decklink

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



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