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

[Rex Dieter]

commit d13e533138a334a043cf74e523109bf07174b4da
Merge: 406c872 2b6847c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:42:55 2014 -0500

    Merge branch 'master' into f20

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