[emacs-common-ess: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/emacs-common-ess

[alexlan]

commit 689fa5bc1b611eb67644a45edf583a855df8eff2
Merge: bfd63a1 24527b8
Author: Alex Lancaster <alexlan at fedoraproject.org>
Date:   Wed Sep 21 00:43:29 2011 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/emacs-common-ess
    
    Conflicts:
    	emacs-common-ess.spec

 emacs-common-ess.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc emacs-common-ess.spec
index 7c25fca,935d673..f2e9d20
--- a/emacs-common-ess.spec
+++ b/emacs-common-ess.spec
@@@ -263,10 -265,9 +263,14 @@@ f
  
  
  %changelog
++
 +* Wed Sep 21 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.14-1
 +- Update to upstream 5.14 (#654727)
 +- Drop XEmacs patch, workaround has now been implemented upstream.
 +
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.11-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Fri Oct 15 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.11-2
  - Add patch to use ".r$" as regex in start start (workaround for problems
    with XEmacs misidentify Perl scripts as R scripts #631707)