commit a5c51eab68003e457351b5fa7f807c3187f4832c Merge: d4a70f5 9859907 Author: Rex Dieter <rdieter at math.unl.edu> Date: Wed Mar 6 16:38:38 2013 -0600 Merge branch 'f18' into f17 .gitignore | 1 + libkdeedu.spec | 21 ++++++++++++++++++--- sources | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) ---