From: Youness Alaoui <kakaroto@kakaroto.homelinux.net>
Date: Fri, 31 Jul 2015 20:28:45 +0000 (-0400)
Subject: Merge branch 'new-settings' into devel
X-Git-Tag: lulzbot-15.02.1-2.01~55
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=804c942bd617f6559475839501cfd7b18ad57dc4;p=cura.git

Merge branch 'new-settings' into devel

This merges a few missed commits
---

804c942bd617f6559475839501cfd7b18ad57dc4