[krdc/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit 677f726e7c2683cede6b54ddf021e77ced63f83b
Merge: 0debbf7 88ee1ee
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:10:42 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    6 ++++++
 krdc.spec  |   23 ++++++++++++++++++++++-
 sources    |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---