commit de5ed3faffea19d5702635ed5f0f88bb1272d9ca Merge: da35b38 294c733 Author: Rex Dieter <rdieter at math.unl.edu> Date: Thu Sep 5 13:45:55 2013 -0500 Merge branch 'master' into f19 .gitignore | 5 +++++ kstars.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) ---