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

[Rex Dieter]

commit e339f99506c778df3486b7c9aa447e22d88301e4
Merge: e1cb7b5 d2a8644
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 20:07:40 2014 -0500

    Merge branch 'master' into f20

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