From: Lawrence Johnston <Lawrence.B.Johnston@gmail.com>
Date: Sat, 7 Apr 2012 20:17:52 +0000 (-0700)
Subject: Merge commit 'd0691018c211d1dbd500c0b3d363da8c5bd2f11d'
X-Git-Tag: RC3~92^2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=53aa2efd71da72d037b529ffa7e533b9b010de31;p=cura.git

Merge commit 'd0691018c211d1dbd500c0b3d363da8c5bd2f11d'
---

53aa2efd71da72d037b529ffa7e533b9b010de31