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

[Rex Dieter]

commit ef872bdb5bde112ec33f8c855cb91eddd8dfdf7b
Merge: 60c0252 9582145
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 08:47:39 2014 -0600

    Merge branch 'master' into f20

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