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

[Rex Dieter]

commit 1dc7aafd18f54dc696708450560e89cc3be2e425
Merge: e152d32 a64b207
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:35:09 2014 -0500

    Merge branch 'master' into f20

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