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

[Rex Dieter]

commit 93142cb3c8b8514d6141158fe32630eda570c627
Merge: 1b9b2da a021c6a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:21:11 2014 -0500

    Merge branch 'master' into f20

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