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

[Rex Dieter]

commit 91a775f5e188afda8925d5c2d52bcd8c28eaa179
Merge: df06370 4253c7a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:13:49 2014 -0500

    Merge branch 'master' into f20

 .gitignore                                         |   24 ++++--------------
 ...static.patch => ksirk-4.12.90-iris_static.patch |   12 ++++----
 ksirk.spec                                         |   25 ++++++++++++++++++-
 sources                                            |    2 +-
 4 files changed, 36 insertions(+), 27 deletions(-)
---