[kgeography/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 65d4d8ca062a786578c34f43506134247e373e20
Merge: 10be3dc fc916b8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 20:24:19 2015 -0600

    Merge branch 'master' into f20

 .gitignore      |    1 +
 kgeography.spec |   11 +++++++----
 sources         |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
---