[gwsmhg: 3/4] Merge branch 'master' of ssh://pkgs.fedoraproject.org/gwsmhg

[Mads Kiilerich]

commit ac783aa98b789cab97d4cb78e62bd1bddf3e9940
Merge: d75f376 2d22268
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Mon Jun 27 21:54:51 2011 +0200

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

 gwsmhg.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --cc gwsmhg.spec
index 332b24a,e269153..4cffa37
--- a/gwsmhg.spec
+++ b/gwsmhg.spec
@@@ -53,11 -53,8 +53,16 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
++<<<<<<< HEAD
 +* Mon Jun 27 2011 Mads Kiilerich <mads at kiilerich.com> - 0.13-1
 +- gwsmhg-0.13
 +
 +* Tue Feb 22 2011 Mads Kiilerich <mads at kiilerich.com> - 0.12-1
 +- gwsmhg-0.12
++=======
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
++>>>>>>> 2d22268743c9d21ce8eba76a2cd6053c24c62295
  
  * Wed Dec 08 2010 Mads Kiilerich <mads at kiilerich.com> - 0.12-1
  - gwsmhg-0.12