commit 07372b25e5973f5e5522d934e77788629582d900 Merge: 722cd7a 8ebac79 Author: Eduardo Mayorga <mayorga at fedoraproject.org> Date: Thu Jan 22 13:38:08 2015 -0600 Merge branch 'f21' of ssh://pkgs.fedoraproject.org/smemstat into f21 Conflicts: smemstat.spec ---