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

[Rex Dieter]

commit 1e7e7d692594025b42c07fc2192e74d327c1b88e
Merge: 095f9ab f6d7eb9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 19:59:31 2014 -0600

    Merge branch 'master' into f20

 kdebindings.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---