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

[Rex Dieter]

commit dd81b4ca2005148c267d9aaf30391d8e6d6b8691
Merge: ea42229 b290514
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 21:53:17 2014 -0500

    Merge branch 'master' into f20

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