commit e152d3298c5718776cc921a51140692f5a65e9aa Merge: 46bb8bf 9abffca Author: Rex Dieter <rdieter at math.unl.edu> Date: Mon Jun 30 22:58:56 2014 -0500 Merge branch 'master' into f20 .gitignore | 6 ++++++ kgeography.spec | 23 ++++++++++++++++++++++- sources | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) ---