[python-djblets/el5/master: 12/12] Merge branch 'master' into el5

[Stephen Gallagher]

commit c200e561b6f6a269596d42a8c7c8ac9f43a56fdb
Merge: 8f11d4f d4d5f75
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Sep 20 09:52:57 2010 -0400

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	python-djblets.spec
    	sources

 .gitignore          |    2 +-
 python-djblets.spec |   11 +++++++++--
 sources             |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 60e1b8a,887f23c..ea8602f
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--Djblets-0.6.3.tar.gz
+ /Djblets-0.6.4.tar.gz
diff --cc python-djblets.spec
index 146ac2d,4089058..451ae3c
--- a/python-djblets.spec
+++ b/python-djblets.spec
@@@ -58,7 -58,14 +58,14 @@@ rm -rf $RPM_BUILD_ROO
  %{python_sitelib}/djblets/
  
  %changelog
+ * Mon Sep 20 2010 Stephen Gallagher <sgallagh at redhat.com> - 0.6.4-9
+ - New upstream release 0.6.4
+ - http://downloads.reviewboard.org/releases/Djblets/0.6/Djblets-0.6.4.NEWS
+ 
+ * Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 0.6.3-8
+ - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+ 
 -* Mon Jul 06 2010 Stephen Gallagher <sgallagh at redhat.com> 0.6.3-7
 +* Mon Jul 06 2010 Stephen Gallagher <sgallagh at redhat.com> 0.6.3-7.1
  - Added utility functions for HTTP Accept-based content negotation.
  - Add some gravy to make sites work better on iphone/ipad Safari
  - Required for ReviewBoard 1.5rc1 and later