[mg/el5: 11/11] Merge branch 'master' of ssh://pkgs.fedoraproject.org/mg into el5

[mmckinst]

commit 501387d907a06f9a1930b9ba8d928acc64528a94
Merge: b0b4bc4 2af845c
Author: Mark McKinstry <mmckinst at umich.edu>
Date:   Sun Jun 22 12:41:00 2014 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/mg into el5

 mg.spec |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)
---