[emacs/f19: 5/5] Merge branch 'master' into f19

[Jaromir Koncicky]

commit dc3494f96e7183f5724c1a5b688ac5d18928ea23
Merge: 6863ad8 50c7e79
Author: Jaromír Končický <jkoncick at redhat.com>
Date:   Wed Aug 14 15:43:34 2013 +0200

    Merge branch 'master' into f19
    
    Conflicts:
    	emacs.spec

 emacs-pdf-default.patch |   13 +++++++++++++
 emacs.spec              |    8 +++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --cc emacs.spec
index 15e3af8,108b376..b65b297
--- a/emacs.spec
+++ b/emacs.spec
@@@ -3,7 -3,7 +3,7 @@@ Summary: GNU Emacs text edito
  Name: emacs
  Epoch: 1
  Version: 24.3
- Release: 10%{?dist}
 -Release: 13%{?dist}
++Release: 11%{?dist}
  License: GPLv3+
  URL: http://www.gnu.org/software/emacs/
  Group: Applications/Editors
@@@ -461,9 -462,18 +464,12 @@@ update-desktop-database &> /dev/null |
  %dir %{_datadir}/emacs/site-lisp/site-start.d
  
  %changelog
 -* Wed Aug 14 2013 Jaromir Koncicky <jkoncick at redhat.com> - 1:24.3-13
++* Wed Aug 14 2013 Jaromir Koncicky <jkoncick at redhat.com> - 1:24.3-11
+ - Fix default PDF viewer (#971162)
+ 
 -* Fri Aug 09 2013 Petr Hracek <phracek at redhat.com> - 1:24.3-12
 +* Fri Aug 09 2013 Petr Hracek <phracek at redhat.com> - 1:24.3-10
  - emacs -mm (maximized) does not work (#985729)
  
 -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:24.3-11
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
 -* Thu Jul 18 2013 Petr Pisar <ppisar at redhat.com> - 1:24.3-10
 -- Perl 5.18 rebuild
 -
  * Tue Apr 09 2013 Petr Hracek <phracek at redhat.com> - 1:24.3-9
  - Help and man page corrections (#948838)