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

[Rex Dieter]

commit 10be3dc96bb4589d0cb987f4f7b7385aa4da7833
Merge: 538617d 97c4248
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:08:11 2014 -0600

    Merge branch 'master' into f20

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