Merge branch 'master' into xsdata

Conflicts:
	lib/Slic3r/ExtrusionPath.pm
	lib/Slic3r/ExtrusionPath/Collection.pm
	lib/Slic3r/GCode.pm
	lib/Slic3r/Line.pm
	lib/Slic3r/Point.pm
This commit is contained in:
Alessandro Ranellucci 2013-09-02 20:27:35 +02:00
commit a1a33c2291

Diff Content Not Available