[kblackbox/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit a7d20554397ac02020981ebc7a436ef42d826687
Merge: e68562a 33d78fe
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:12:10 2013 -0500

    Merge branch 'master' into f19

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