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

[Rex Dieter]

commit c769fb8ff5e1c3e579bdfcea35929bce7aad5eb1
Merge: d13e533 7a5c4fe
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:24:47 2014 -0500

    Merge branch 'master' into f20

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