[Bf-blender-cvs] [826ba12] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 826ba124b6f04e3bf47d68e3c4bce6763d9a8615
Author: Bastien Montagne
Date:   Wed Mar 30 21:10:10 2016 +0200
Branches: id-remap
https://developer.blender.org/rB826ba124b6f04e3bf47d68e3c4bce6763d9a8615

Merge branch 'master' into id-remap

Conflicts:
	source/blender/blenkernel/intern/library_query.c

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



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