[hplip/f15/master: 2/2] Merge branch 'f14' into f15

[Jiří Popelka]

commit 734e7b757afad903196717d315098be6be332cd7
Merge: b088af8 e33387e
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Mar 18 14:12:39 2011 +0100

    Merge branch 'f14' into f15

 .gitignore              |    1 +
 hplip-3.11.1.tar.gz.asc |    7 -------
 hplip-3.11.3.tar.gz.asc |    7 +++++++
 hplip.spec              |    8 ++++++--
 sources                 |    2 +-
 5 files changed, 15 insertions(+), 10 deletions(-)
---
diff --cc hplip.spec
index 4a172c8,12ddd9e..66fcac6
--- a/hplip.spec
+++ b/hplip.spec
@@@ -519,7 -519,10 +520,10 @@@ f
  %postun libs -p /sbin/ldconfig
  
  %changelog
+ * Fri Mar 18 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.3-1
+ - 3.11.3 (new hpps filter)
+ 
 -* Tue Mar  1 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.1-3
 +* Tue Mar  1 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.1-5
  - Avoid KeyError in ui4/wifisetupdialog.py (bug #680939).
  - Corrected IEEE 1284 Device IDs:
    LaserJet 1300 (bug #670548)