[system-config-printer/f21: 2/2] Merge branch 'f20' into f21

[Tim Waugh]

commit aa20407706573aee85d0e5bc7ef23e600d5b907c
Merge: a801f2c e429fbb
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Jul 11 17:30:21 2014 +0100

    Merge branch 'f20' into f21

 system-config-printer-permission.patch |   21 +++++++++++++++++++++
 system-config-printer.spec             |    9 ++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---