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

[Rex Dieter]

commit 31e122abcf2ed9632e0bfeea2778071a84345739
Merge: 863f6ff 4bd0e74
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 09:04:17 2014 -0600

    Merge branch 'master' into f20

 .gitignore      |    6 ++++++
 kgeography.spec |   20 +++++++++++++++++++-
 sources         |    2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)
---