From: Lawrence Johnston <Lawrence.B.Johnston@gmail.com>
Date: Sun, 18 Mar 2012 21:32:48 +0000 (-0700)
Subject: Merge commit '19fcc1186a1173b594a16fcd2a88a3616415b291'
X-Git-Tag: RC3~92^2~7
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=20349fc8341f028ecf04f747310a3f20c55bd176;p=cura.git

Merge commit '19fcc1186a1173b594a16fcd2a88a3616415b291'
---

20349fc8341f028ecf04f747310a3f20c55bd176