From ac783aa98b789cab97d4cb78e62bd1bddf3e9940 Mon Sep 17 00:00:00 2001
From: Mads Kiilerich <mads@kiilerich.com>
Date: Jun 27 2011 19:54:51 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/gwsmhg


Conflicts:
	gwsmhg.spec

---

diff --git a/gwsmhg.spec b/gwsmhg.spec
index 332b24a..4cffa37 100644
--- a/gwsmhg.spec
+++ b/gwsmhg.spec
@@ -53,11 +53,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+<<<<<<< HEAD
 * Mon Jun 27 2011 Mads Kiilerich <mads@kiilerich.com> - 0.13-1
 - gwsmhg-0.13
 
 * Tue Feb 22 2011 Mads Kiilerich <mads@kiilerich.com> - 0.12-1
 - gwsmhg-0.12
+=======
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+>>>>>>> 2d22268743c9d21ce8eba76a2cd6053c24c62295
 
 * Wed Dec 08 2010 Mads Kiilerich <mads@kiilerich.com> - 0.12-1
 - gwsmhg-0.12