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

[Rex Dieter]

commit 6ee42d0ffa0816bc83dbaec98262b699a10cf1e5
Merge: 8d17ca5 4034743
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:56:21 2014 -0500

    Merge branch 'master' into f20

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