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

[Rex Dieter]

commit b5ceae81acc5cd473d0611feeafbc393bd50ee0f
Merge: 3ca1e68 8ffb210
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:15:44 2014 -0500

    Merge branch 'master' into f20

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