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

[Rex Dieter]

commit 87e293041e6a78dfd15fda9ba7e63283c534ab8f
Merge: 9edeeca 0213852
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 17:40:52 2014 -0500

    Merge branch 'master' into f20

 .gitignore                             |    1 -
 0001-Fix-building-with-PyQt-4.11.patch |   73 ++++++++++++++++++++++++++++++++
 pykde4.spec                            |   10 +++--
 3 files changed, 79 insertions(+), 5 deletions(-)
---