[kblocks/f20: 5/5] Merge branch 'master' into f20

[Rex Dieter]

commit af015d661d97a0ec1119a3b691afe4504866a506
Merge: c769fb8 3a0b87c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:04:45 2014 -0500

    Merge branch 'master' into f20

 .gitignore   |    3 +++
 kblocks.spec |   14 +++++++++++++-
 sources      |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---