commit 3ac38839b90d9d8c5bec2f7924d1c1d7e39a0b80 Merge: 84f68b9 4b3c1df Author: Martin Stransky <stransky at anakreon.cz> Date: Sat Nov 29 18:16:46 2014 +0100 Merge branch 'master' into f21 ---