From: Lawrence Johnston <Lawrence.B.Johnston@gmail.com>
Date: Wed, 4 Apr 2012 00:58:27 +0000 (-0700)
Subject: Merge commit '96d014b2c4cef94dbbe4c3adc1c8d7a8ce929ad2'
X-Git-Tag: RC3~92^2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1755cb8c3f969f2bf63822625d548fb22ae628dc;p=cura.git

Merge commit '96d014b2c4cef94dbbe4c3adc1c8d7a8ce929ad2'
---

1755cb8c3f969f2bf63822625d548fb22ae628dc