[gummi: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/gummi

[Fabian Affolter]

commit 983d5f05c7171ee362135459ce1d4cff77a6cf33
Merge: d8c8fcd b33b5bb
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Thu Nov 17 13:28:16 2011 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/gummi
    
    Conflicts:
    	gummi.spec

 gummi.spec |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
---
diff --cc gummi.spec
index 668bf5e,cc1eac8..ef6c818
--- a/gummi.spec
+++ b/gummi.spec
@@@ -60,10 -60,16 +60,20 @@@ rm -rf %{buildroot
  
  
  %changelog
++<<<<<<< HEAD
 +* Thu Nov 17 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.6.0-1
 +- Updated to new upstream version 0.6.0
 +
- * Fri Aug 12 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.5.8-3
+ * Fri Oct 28 2011 Rex Dieter <rdieter at fedoraproject.org> - 0.5.8-6
+ - rebuild(poppler)
+ 
+ * Fri Sep 30 2011 Marek Kasik <mkasik at redhat.com> - 0.5.8-5
+ - Rebuild (poppler-0.18.0)
+ 
+ * Mon Sep 19 2011 Marek Kasik <mkasik at redhat.com> - 0.5.8-4
+ - Rebuild (poppler-0.17.3)
+ 
+ * Fri Aug 12 2011 Fabian Affolter <fabian at bernewireless.net> - 0.5.8-3
  - Rebuild (libgtksourceview)
  
  * Fri Jul 15 2011 Marek Kasik <mkasik at redhat.com> - 0.5.8-2