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

[Rex Dieter]

commit 9e410614de90ebf9aaddd6aae6cc3802fec4be71
Merge: fdf846e 14b40f1
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Feb 1 22:42:36 2015 -0600

    Merge branch 'master' into f20

 smokekde.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---