commit 13217851719662f458ca34d26e4a3bb30fc96f98 Merge: 87e759f c7bc34c Author: Erwin Waterlander <waterlan at xs4all.nl> Date: Mon Jan 19 23:03:18 2015 +0100 Merge branch 'master' of ssh://pkgs.fedoraproject.org/wcd Conflicts: wcd.spec ---