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

[Rex Dieter]

commit c032c9ee101927d0428d87ed8a67e7c5765b430a
Merge: 6a2dd61 fa7f358
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 11:03:18 2014 -0600

    Merge branch 'master' into f20

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