commit 4b5af3f2faf9003973089558c252c966bd50b5ae Merge: f1ff7cc 65139d8 Author: sagitter <sagitter(a)fedoraproject.org&gt; Date: Wed Aug 30 10:53:28 2017 +0200 Merge branch 'master' into f25 .gitignore | 1 + sources | 2 +- xpra-codecs-freeworld.spec | 15 ++++++++++----- 3 files changed, 12 insertions(+), 6 deletions(-) ---