From: Steven Abadie <steven@alephobjects.com>
Date: Fri, 2 Jan 2015 07:54:20 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master' into AO-build
X-Git-Tag: 14.09-1.18~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=00c2fdffe72548037a301d21a65e9de6de09ad76;p=cura.git

Merge remote-tracking branch 'origin/master' into AO-build
---

00c2fdffe72548037a301d21a65e9de6de09ad76