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

[Rex Dieter]

commit 4dd3025c40140fe201367850bd396338920abe99
Merge: 73a3f15 967f5c7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 19:55:42 2014 -0600

    Merge branch 'master' into f20

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