Tamara Hogenhout 38346dd95f Merge branch '15.06'
Conflicts:
	cura/CuraApplication.py
2015-06-10 15:18:45 +02:00
..
2015-06-10 15:18:45 +02:00