commit f6046b06255126a640fb79b3aa2a7d9fb53d7c30 Merge: 7a35e35 431c454 Author: Rex Dieter <rdieter at math.unl.edu> Date: Sat Dec 29 07:54:16 2012 -0600 Merge branch 'f18' into f17 .gitignore | 1 + kstars.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---