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

[Rex Dieter]

commit c330c9a39ba51af8db8ba44b10e72c8ff7250ed3
Merge: fb8ad5a 1d1fcb9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 16:53:21 2015 -0600

    Merge branch 'master' into f20

 .gitignore     |    2 ++
 kblackbox.spec |   12 +++++++++---
 sources        |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---