[Fedora-spins] [spin-kickstarts/f19: 4/4] Merge remote-tracking branch 'origin/f19' into f19

[Bruno Wolff III]

commit 3cfde69cd0ee06f70b8b06fbd77538e6d78cd3d1
Merge: 4c054d7 96833b7
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Thu Jun 27 23:39:25 2013 -0500

    Merge remote-tracking branch 'origin/f19' into f19
    
    Conflicts:
    	configure.ac
    	spin-kickstarts.spec.in

 fedora-live-jam-kde.ks           |    3 +--
 fedora-livedvd-scientific-kde.ks |    2 --
 2 files changed, 1 insertions(+), 4 deletions(-)
---