From: Lawrence Johnston <Lawrence.B.Johnston@gmail.com>
Date: Tue, 20 Mar 2012 16:46:29 +0000 (-0700)
Subject: Merge commit 'e9c7135f5c71cf7342518cd8071e7b2531463b8d'
X-Git-Tag: RC3~92^2~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=de7dd5e255eeca4f3156276c9e6042f13f4cd3d4;p=cura.git

Merge commit 'e9c7135f5c71cf7342518cd8071e7b2531463b8d'
---

de7dd5e255eeca4f3156276c9e6042f13f4cd3d4