commit 4ed011db11e1f73199803ead76d7a70dcf349d61 Merge: caefd61 017429f Author: Martin Stransky <stransky at anakreon.cz> Date: Fri Dec 13 13:52:34 2013 +0100 Merge branch 'master' into f18 ---