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

Conflicts:

	fedora-livecd-education-math.ks
This commit is contained in:
Jeroen van Meeuwen (Fedora Unity) 2008-07-16 15:49:52 +02:00
commit e0d07dd55f

View File

@ -3,7 +3,7 @@
# Filename:
# fedora-livecd-education-math.ks
# Version:
# alpha 5
# beta 1
# Description:
# Fedora Live Spin including mainly software for educational & mathematical purposes
# Maintainers: