[hplip: 2/3] Merge branch 'f17' into f18

[Jiří Popelka]

commit df33be4c0b3acf6e656f9a92bd047bd941bcacfe
Merge: 367b829 1c30332
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Oct 4 15:39:11 2012 +0200

    Merge branch 'f17' into f18

 .gitignore               |    1 +
 hplip-3.12.10.tar.gz.asc |    7 +++++++
 hplip-3.12.9.tar.gz.asc  |    7 -------
 hplip-cron-locale.patch  |   12 ------------
 hplip.spec               |   11 +++++------
 sources                  |    2 +-
 6 files changed, 14 insertions(+), 26 deletions(-)
---