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

[Rex Dieter]

commit 8b56588c67367c5bc42c177133c2ba60a8355d66
Merge: 892f9bc 613ac31
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 07:34:43 2014 -0600

    Merge branch 'master' into f20

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