commit bb63a8a81a24a79e048000e285b476fc8edb72e2 Merge: 630ebe1 bdc53ec Author: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> Date: Thu Jul 24 14:07:17 2014 +0200 Merge branch 'master' of ssh://pkgs.fedoraproject.org/sagator Conflicts: sagator.spec ---