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

[Rex Dieter]

commit a160252fb7b17cbefa99747a825b89ad2299244e
Merge: 1d43387 8634050
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:53:30 2014 -0500

    Merge branch 'master' into f20

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