From: Daid <daid303@gmail.com>
Date: Mon, 2 Apr 2012 17:39:36 +0000 (+0200)
Subject: Fix confict
X-Git-Tag: RC1~10
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2595e57d5abf6c2052072d77848cc75f88bca3bc;p=cura.git

Fix confict
---

2595e57d5abf6c2052072d77848cc75f88bca3bc