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

[Rex Dieter]

commit 0d2ba8f08deb60558a9d9c04c644d8115a1f05f6
Merge: af59c26 3d4fad5
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:10:23 2015 -0600

    Merge branch 'master' into f20

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