From cc53c67fc1e948fe6d921b897fdc78dbfe105a09 Mon Sep 17 00:00:00 2001
From: Luke Macken <lmacken@redhat.com>
Date: Jun 24 2014 18:26:39 +0000
Subject: Update to 0.9.10


---

diff --git a/.gitignore b/.gitignore
index 059172e..29ea9ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ bodhi-0.7.14.tar.bz2
 /bodhi-0.9.8.tar.bz2
 /bodhi-0.9.9.tar.bz2
 /bodhi-0.9.9.2.tar.bz2
+/bodhi-0.9.10.tar.bz2
diff --git a/bodhi.spec b/bodhi.spec
index 659c1e9..cec187f 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -2,8 +2,13 @@
 %{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
+<<<<<<< HEAD
 Version:        0.9.9.2
 Release:        2%{?dist}
+=======
+Version:        0.9.10
+Release:        1%{?dist}
+>>>>>>> Update to 0.9.10
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
 License:        GPLv2+
@@ -133,6 +138,9 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
 
 
 %changelog
+* Tue Jun 24 2014 Luke Macken <lmacken@redhat.com> - 0.9.10-1
+- Update to 0.9.10
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.9.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 67fa5ac..9ae9f3c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22023969356906d9c60bb508269cee3e  bodhi-0.9.9.2.tar.bz2
+3ffeb231ea7af7a01afbc15f995ffcf0  bodhi-0.9.10.tar.bz2