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

Merge commit '2fcd59bfb6f3580784252ce2691ce48a95eea284'
---

16a4ea1b60bbd629f08b5aca8f1f24bc8b15c1c7