[kstars/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit f5311445334596f27ddb1b15f476b2b5f7b75759
Merge: 6882664 a2cd811
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 11:34:45 2014 -0600

    Merge branch 'master' into f20

 .gitignore  |    6 ++++++
 kstars.spec |   23 ++++++++++++++++++++++-
 sources     |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---