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

[Rex Dieter]

commit cb66aadfbd564938c691a7e7f0a783718c706406
Merge: 1a0a5e7 9d1da3a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:44:11 2014 -0500

    Merge branch 'master' into f20

 .gitignore   |    3 +++
 konsole.spec |   14 +++++++++++++-
 sources      |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---