[spin-kickstarts/f22: 2/2] Merge branch 'f22' of ssh://git.fedorahosted.org/git/spin-kickstarts into f22

[Peter Robinson]

commit 906bbfee127b2871c37f46c19ef211cbb6b4c653
Merge: a9325d0 0a2751d
Author: Peter Robinson 
Date:   Thu Apr 23 16:56:16 2015 +0100

Merge branch 'f22' of ssh://git.fedorahosted.org/git/spin-kickstarts into f22

atomic-installer/lorax-configure-repo.tmpl |    2 +-
 fedora-arm-server.ks                       |    3 +
 fedora-live-design_suite.ks                |    6 +-
 fedora-livedvd-electronic_lab.ks           |   59 ----------------------------
 4 files changed, 7 insertions(+), 63 deletions(-)
---