[releng: 2/2] Merge branch 'master' of ssh://git.fedorahosted.org/git/releng

[Jon Ciesla]

commit c8dc454ce26ac6537e9cdfc60151b0b2b59f815e
Merge: 4318be5 3d5c390
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu May 28 07:17:19 2015 -0500

    Merge branch 'master' of ssh://git.fedorahosted.org/git/releng

 scripts/build-livecds |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---