[smokekde/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit 340a5ef58cbbc5e1cae9e47291a76735087b162d
Merge: 22ddf55 f54a5dd
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Feb 2 22:15:28 2014 -0600

    Merge branch 'master' into f20

 .gitignore    |    6 ++++++
 smokekde.spec |   20 +++++++++++++++++++-
 sources       |    2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)
---