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

Merge branch 'new-settings' into devel

Fixes T51
---

cadb0433220d48bed695cd1f3e6f240186956635