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

[Rex Dieter]

commit 1a0a5e7872671acd4cf852bcfe8cc4065294afb3
Merge: 5a62c4b 2b4978f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:42:13 2014 -0500

    Merge branch 'master' into f20

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