22092014
Merge branch 'bistro_i3' of https://github.com/hackerspace/slic3r into bistro_i3

Conflicts:
	slic3r.ini