[Bf-blender-cvs] [cd35a60] fluid-mantaflow: Merge remote-tracking branch 'github/soc-2014-fluid' into soc-2014-fluid

[Sebastián Barschkis]

Commit: cd35a608b3a8bed8db5014f912898cdc8b1ce5df
Author: Sebastián Barschkis
Date:   Wed Dec 23 23:53:11 2015 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBcd35a608b3a8bed8db5014f912898cdc8b1ce5df

Merge remote-tracking branch 'github/soc-2014-fluid' into soc-2014-fluid

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



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