[ed/f19: 2/2] Merge commit 'ea1929c25ae0d0879b3a509476057fb99bc6cc86' into f19

[Karsten Hopp]

commit c67249d0bf6372668a75d6cb56db4112ec9b4312
Merge: eb0a940 ea1929c
Author: Karsten Hopp <karsten at redhat.com>
Date:   Tue May 14 14:45:15 2013 +0200

    Merge commit 'ea1929c25ae0d0879b3a509476057fb99bc6cc86' into f19
    
    Conflicts:
    	ed.spec

 .gitignore |    1 +
 ed.spec    |   22 ++++++++++++----------
 sources    |    2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)
---
diff --cc ed.spec
index ba3c170,9894c25..454b408
--- a/ed.spec
+++ b/ed.spec
@@@ -56,9 -54,10 +54,13 @@@ f
  %{_mandir}/*/*
  
  %changelog
+ * Tue May 14 2013 Karsten Hopp <karsten at redhat.com> 1.8-1
+ - update to ed-1.8
+ - spec file cleanups
+ 
 +* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-3
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +
  * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild