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

[Rex Dieter]

commit 5edf73563b8c435e921e9639b170bb7576a08c29
Merge: b1fff38 4936ab0
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:24:33 2014 -0500

    Merge branch 'master' into f20

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