From 1c7ff0b332af57cd5a297145d94ccef94b8bdc4a Mon Sep 17 00:00:00 2001
From: Paul Wouters <paul@nohats.ca>
Date: Oct 25 2012 22:47:56 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/geome


Conflicts:
	geome.spec

---

diff --git a/geome.spec b/geome.spec
index 1080834..e37ccea 100644
--- a/geome.spec
+++ b/geome.spec
@@ -51,6 +51,9 @@ install -p -m 644 geome.1 %{buildroot}%{_mandir}/man1
 - Update to 1.2, which splits library and command tool in subpackage
 - Remove dependancy on python-simplejson
 
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Tue Apr 10 2012 Paul Wouters <pwouters@redhat.com> - 1.1-3
 - Removed python-argparse which is folderd into python
   on Fedora (not EL)