[cups-filters/f22: 2/2] Merge branch 'f21' into f22

[Jiří Popelka]

commit 07828e9737d94bb60e9c47c32d8e82f324cc11a0
Merge: db7c235 d27e97c
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Feb 16 12:55:52 2015 +0100

    Merge branch 'f21' into f22

 .gitignore        |    1 +
 cups-filters.spec |    7 +++++--
 sources           |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc cups-filters.spec
index 1d38df1,268ebc0..bbd4e4c
--- a/cups-filters.spec
+++ b/cups-filters.spec
@@@ -245,12 -245,9 +245,15 @@@ f
  %{_libdir}/libfontembed.so
  
  %changelog
+ * Mon Feb 16 2015 Jiri Popelka <jpopelka at redhat.com> - 1.0.65-1
+ - 1.0.65
+ 
 +* Fri Jan 23 2015 Marek Kasik <mkasik at redhat.com> - 1.0.61-3
 +- Rebuild (poppler-0.30.0)
 +
 +* Thu Nov 27 2014 Marek Kasik <mkasik at redhat.com> - 1.0.61-2
 +- Rebuild (poppler-0.28.1)
 +
  * Fri Oct 10 2014 Jiri Popelka <jpopelka at redhat.com> - 1.0.61-1
  - 1.0.61