[kdelibs/f20: 6/6] Merge branch 'master' into f20

[Rex Dieter]

commit e7f791c2464e7c93bfd88779026553d4faaf452b
Merge: 557f3f6 13cd99a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jul 14 20:30:50 2014 -0500

    Merge branch 'master' into f20

 .gitignore                                         |    2 +-
 ...global-loading-of-DTD-and-entities-no-mor.patch |   36 ------------
 ...on-t-require-a-job-to-handle-messageboxes.patch |   58 --------------------
 kdelibs-4.13.2-invokeTerminal.patch                |   17 ++++++
 kdelibs.spec                                       |   40 +++++++++-----
 sources                                            |    2 +-
 6 files changed, 45 insertions(+), 110 deletions(-)
---