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

Merge commit '6de282f4b7c2a8d17fe5371d54b6a7825f55a120'
---

e8596a4b545e40190793db160347db5c7fd41cca