commit 6662fa388088b4298d4fe4624f67dd0bbaca2900 Merge: d6210ff 4b3c1df Author: Martin Stransky <stransky at anakreon.cz> Date: Sat Nov 29 18:16:42 2014 +0100 Merge branch 'master' into f19 ---