commit 60e80782a947403e59d6c5e2ba4a19511cadd1ad Merge: 512b932 4b3c1df Author: Martin Stransky <stransky at anakreon.cz> Date: Sat Nov 29 18:16:45 2014 +0100 Merge branch 'master' into f20 ---