[Bf-blender-cvs] [0a7af14] soc-2014-bge: Merge remote-tracking branch 'origin/master' into soc-2014-bge

[Ines Almeida]

Commit: 0a7af1416328b31f698347bd0a579220256f20af
Author: Ines Almeida
Date:   Sat Aug 23 23:41:21 2014 +0200
Branches: soc-2014-bge
https://developer.blender.org/rB0a7af1416328b31f698347bd0a579220256f20af

Merge remote-tracking branch 'origin/master' into soc-2014-bge

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



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