From: Lawrence Johnston <Lawrence.B.Johnston@gmail.com>
Date: Sun, 11 Mar 2012 21:57:57 +0000 (-0700)
Subject: Merge commit '351bb29ade66bed0b3b147cd790293d206127c95'
X-Git-Tag: RC3~92^2~10
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f160894298855775b676d62bd4de9447aac282f9;p=cura.git

Merge commit '351bb29ade66bed0b3b147cd790293d206127c95'

* commit '351bb29ade66bed0b3b147cd790293d206127c95':
  Fixed flip options, added show log when slicing fails, fixed bug in comb module
---

f160894298855775b676d62bd4de9447aac282f9