[bodhi/f17: 5/6] Merge branch 'master' into f17

[Luke Macken]

commit 13abe6f55ecd7a423cd2aa7a0c2ce0fd7963b819
Merge: f37febc 2b7a060
Author: Luke Macken <lmacken at redhat.com>
Date:   Mon May 13 17:23:51 2013 -0400

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	bodhi.spec
    	sources

 .gitignore |    5 +++++
 bodhi.spec |    8 +++++++-
 sources    |    4 ++++
 3 files changed, 16 insertions(+), 1 deletions(-)
---
diff --cc .gitignore
index 10d2d44,06cd622..0770339
--- a/.gitignore
+++ b/.gitignore
@@@ -15,3 -15,5 +15,8 @@@ bodhi-0.7.14.tar.bz
  /bodhi-0.8.5.tar.bz2
  /bodhi-0.9.2.tar.bz2
  /bodhi-0.9.3.tar.bz2
++<<<<<<< HEAD
++=======
+ /bodhi-0.9.4.tar.bz2
+ /bodhi-0.9.5.tar.bz2
++>>>>>>> master
diff --cc bodhi.spec
index 6c4bebf,6b593da..f923e3a
--- a/bodhi.spec
+++ b/bodhi.spec
@@@ -133,6 -133,15 +133,12 @@@ rm -rf bodhi/tests bodhi/tools/test-bod
  
  
  %changelog
+ * Mon May 13 2013 Luke Macken <lmacken at redhat.com> - 0.9.5-1
+ - New bugfix release to work with python-bugzilla 0.8.0
+ 
+ * Fri Feb 22 2013 Luke Macken <lmacken at redhat.com> - 0.9.4-1
+ - New bugfix release
+ 
 -* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
  * Tue Nov 13 2012 Luke Macken <lmacken at redhat.com> - 0.9.3-1
  - 0.9.3 bugfix release
  
diff --cc sources
index 7397040,1c4d346..b6af61c
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +77c984cb1f28f80a936812619b0f420d  bodhi-0.9.3.tar.bz2
++=======
+ 688437fcc5fe8649001e513dbee76303  bodhi-0.9.5.tar.bz2
++>>>>>>> master