[hplip: 3/3] Merge branch 'f18'

[Jiří Popelka]

commit 33d387dbbf55b9210e760589b536dec97f518923
Merge: 370694b 3893993
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Mar 8 14:13:40 2013 +0100

    Merge branch 'f18'

 .gitignore              |    1 +
 hplip-3.13.2.tar.gz.asc |    7 -------
 hplip-3.13.3.tar.gz.asc |    7 +++++++
 hplip-pillow.patch      |   39 ---------------------------------------
 hplip.spec              |    9 ++++-----
 sources                 |    2 +-
 6 files changed, 13 insertions(+), 52 deletions(-)
---