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

[Rex Dieter]

commit 5a62c4ba55553671c15b6f0785b41952ec7c7252
Merge: c881e92 217e9ef
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:09:11 2014 -0500

    Merge branch 'master' into f20

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