FreeCAD/FreeCAD_sf_master — pull request #23 by mdinger (2014-05-08 15:32:54+00:00)
Title: Remove conflict between min/max macro in windows.h and std::min/max

Requesting merge. The bug is [here](http://freecadweb.org/tracker/view.php?id=1535).