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

[Fabian Affolter]

commit 9b48f3ff1d3754cf44c84e377014498eba58305e
Merge: c4ecb9a 8bae46d
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Fri Mar 23 20:27:57 2012 +0100

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

 .gitignore |    1 +
 gummi.spec |    3 +++
 sources    |    2 +-
 3 files changed, 5 insertions(+), 1 deletions(-)
---
diff --cc .gitignore
index 4bdd294,4bdd294..12512d2
--- a/.gitignore
+++ b/.gitignore
@@@ -4,3 -4,3 +4,4 @@@ gummi-0.4.8.tar.g
  /gummi-0.5.5.tar.gz
  /gummi-0.5.8-2.tar.gz
  /gummi-0.6.0.tar.gz
++/gummi-0.6.2.tar.gz
diff --cc gummi.spec
index 3b927f1,19326b4..f473eb4
--- a/gummi.spec
+++ b/gummi.spec
@@@ -62,12 -62,9 +62,15 @@@ rm -rf %{buildroot
  
  
  %changelog
 +* Fri Mar 23 2012 Fabian Affolter <mail at fabian-affolter.ch> - 0.6.2-1
 +- Updated to new upstream version 0.6.2
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
 +* Thu Dec 08 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.6.1-1
 +- Updated to new upstream version 0.6.1
 +
  * Mon Nov 28 2011 Marek Kasik <mkasik at redhat.com> - 0.6.0-2
  - Add output of "pkg-config --libs gthread-2.0" to Makefile.in to fix build
  
diff --cc sources
index b87d972,b87d972..023e817
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,1 @@@
--45c727b815460e108a4442db27edd385  gummi-0.6.0.tar.gz
++62dc8655ee3da8e09a6060e4ec9ebb21  gummi-0.6.2.tar.gz