[hplip/f21: 2/2] Merge branch 'f20' into f21

[Tim Waugh]

commit 581b896e8de0f28c88f468764be04258aec2a183
Merge: 01dfa4f d54088d
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Jul 9 11:12:00 2014 +0100

    Merge branch 'f20' into f21

 hplip-codec.patch |   15 ++++++++++-----
 hplip.spec        |    3 +++
 2 files changed, 13 insertions(+), 5 deletions(-)
---