[kate/f20: 12/12] Merge branch 'master' into f20

[Rex Dieter]

commit e3d1d74e5a87d66e17b3c12234c8d9c928882909
Merge: 3d5b5a0 43173ce
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 19:47:39 2014 -0500

    Merge branch 'master' into f20

 .gitignore                                         |   10 +----
 ...r-exception-rollback-as-it-was-before-T.C.patch |   27 ---------------
 kate-4.12.90-python_library_realpath.patch         |   21 +++++++++++
 kate.spec                                          |   36 +++++++++++++++++---
 sources                                            |    2 +-
 5 files changed, 55 insertions(+), 41 deletions(-)
---