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

[Rex Dieter]

commit 0274cb1361a9d6c1002e1a8522c585a601b7a295
Merge: 93bd3dd fb67fd0
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 22:20:55 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    1 +
 ksirk.spec |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---