From: Lawrence Johnston <Lawrence.B.Johnston@gmail.com>
Date: Fri, 23 Mar 2012 02:18:47 +0000 (-0700)
Subject: Merge commit '25687ea3b8a2583ba30b27c30d78672c7135374a'
X-Git-Tag: RC3~92^2~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8a2085762f928a23ac6a073eea0a0c23d41d711b;p=cura.git

Merge commit '25687ea3b8a2583ba30b27c30d78672c7135374a'
---

8a2085762f928a23ac6a073eea0a0c23d41d711b