Blender Git Commit Log

Merge branch 'master' into soc-2013-paint

Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/editors/transform/transform.h
source/blender/makesdna/DNA_material_types.h