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

[Jiří Popelka]

commit 10f54436fa7be0d365e83257c23789a0fcff22ec
Merge: 6692717 876d356
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Oct 11 09:24:27 2012 +0200

    Merge branch 'f18'

 .gitignore                |    1 +
 hplip-3.12.10.tar.gz.asc  |    7 -------
 hplip-3.12.10a.tar.gz.asc |    7 +++++++
 hplip.spec                |   11 ++++++++---
 sources                   |    2 +-
 5 files changed, 17 insertions(+), 11 deletions(-)
---