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

[Rex Dieter]

commit 9184c1a47758a3cd5b5bdf2cf3ef73df42089b00
Merge: 93142cb ed3b06b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:50:31 2014 -0500

    Merge branch 'master' into f20

 .gitignore  |    1 +
 okteta.spec |   17 +++++++++++------
 sources     |    2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)
---