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

[Tim Waugh]

commit 3bbd32f9840e38091b69c5d08e67a735420a6b8f
Merge: aa20407 885df88
Author: Tim Waugh <twaugh at redhat.com>
Date:   Mon Jul 14 11:14:41 2014 +0100

    Merge branch 'f20' into f21

 system-config-printer-retrieve.patch |   25 +++++++++++++++++++++++++
 system-config-printer.spec           |    9 ++++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---