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

[Rex Dieter]

commit fe2cebd112a1eb79c2e9c9d85d63d3caebe1874a
Merge: 139ce56 bf2bd45
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:30:25 2014 -0500

    Merge branch 'master' into f20

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