commit 17d1c84bc1ca4da59476940ad4d0818fc1946707 Merge: a39f847 f7cb953 Author: Joost van der Sluis <joost at cnoc.nl> Date: Mon Mar 9 13:53:46 2015 +0100 Merge branch 'master' of ssh://pkgs.fedoraproject.org/fpc Conflicts: fpc.spec ---