[ReviewBoard/el5/master: 18/18] Merge branch 'master' into el5

[Stephen Gallagher]

commit f405fa74fbfb4b1272e76afcc3d73c80dd9386a0
Merge: cf8ac6d 39abff5
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Sep 20 09:59:29 2010 -0400

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	ReviewBoard.spec
    	sources

 .gitignore       |    2 +-
 ReviewBoard.spec |   17 +++++++++++++----
 sources          |    2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 2028949,ffa6c79..c9ed665
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--ReviewBoard-1.5rc1.tar.gz
+ /ReviewBoard-1.5rc2.tar.gz
diff --cc ReviewBoard.spec
index 2a27933,affee2e..1a527b5
--- a/ReviewBoard.spec
+++ b/ReviewBoard.spec
@@@ -78,6 -77,21 +78,15 @@@ rm -rf $RPM_BUILD_ROO
  %{python_sitelib}/webtests/*.py*
  
  %changelog
+ * Mon Sep 20 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.5-16.rc2
 -- Fix specfile typo causing build break
 -
 -* Mon Sep 20 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.5-15.rc2
+ - Update to new upstream release 1.5rc2
+ - Added Python 2.7 compatibility.
+ - Added compatibility with PyLucene 3.x. Support for 2.x still remains.
+ - Added support for review requests without diffs, for image/screenshot review
+ - Assorted API improvements and bugfixes
+ - Update Djblets requirement to 0.6.4
+ - http://www.reviewboard.org/docs/releasenotes/dev/reviewboard/1.5-rc-2/
+ 
 -* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 1.5-14.rc1.1
 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 -
  * Fri Jul 09 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.5-14.rc1
  - Add missing Requires: python-dateutil