From: Lawrence Johnston <Lawrence.B.Johnston@gmail.com>
Date: Tue, 3 Apr 2012 03:04:15 +0000 (-0700)
Subject: Merge commit '870c4952fdb3268f5d4b6359d2e8046a6bb8df4f'
X-Git-Tag: RC3~92^2~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3ccd965f3f86247dcadaafd196c66835ca51d4e2;p=cura.git

Merge commit '870c4952fdb3268f5d4b6359d2e8046a6bb8df4f'
---

3ccd965f3f86247dcadaafd196c66835ca51d4e2