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

[Rex Dieter]

commit 34c6437e6a469429817bdef4691b66a670023558
Merge: c805732 8e9abce
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:18:08 2014 -0600

    Merge branch 'master' into f20

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