[kde-print-manager/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 82f28130ae34e80fa7dd873f4d9184a9d00ebe66
Merge: a160252 ca74538
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:31:43 2014 -0500

    Merge branch 'master' into f20

 .gitignore             |    1 +
 kde-print-manager.spec |    5 ++++-
 sources                |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---