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

Merge remote-tracking branch 'origin/new-settings' into new-settings
---

d4183ffdffc9ea9d3c4a267426720d5693269cbe