[pykde4/f20: 22/22] Merge branch 'master' into f20

[Rex Dieter]

commit 9edeecaaf1060e8a3f6862158204e9405ed81fe7
Merge: 9cb6724 8c591af
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 17:17:05 2014 -0500

    Merge branch 'master' into f20

 .gitignore                                        |   10 +--
 pykde4-4.12.3-python_library_realpath.patch       |   13 ++
 pykde4-4.12.3-sip_4_15_5.patch                    |   12 ++
 pykde4-4.13.1-sip416.patch                        |   14 ++
 pykde4.spec                                       |  140 +++++++++++++-------
 pythonpluginfactory_use_versioned_python_lib.diff |   21 ---
 sources                                           |    2 +-
 7 files changed, 133 insertions(+), 79 deletions(-)
---