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

[Stephen Gallagher]

commit 59df66a8888e239697a8734544d9c46411d43646
Merge: f405fa7 17a6546
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Fri Oct 1 08:09:12 2010 -0400

    Merge branch 'master' into el5

 .gitignore       |    1 +
 ReviewBoard.spec |   11 ++++++++---
 sources          |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index c9ed665,7ede1a3..c9a21b4
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -ReviewBoard-1.5rc1.tar.gz
  /ReviewBoard-1.5rc2.tar.gz
+ /ReviewBoard-1.5.tar.gz
diff --cc ReviewBoard.spec
index 1a527b5,e7371a8..75f1f3e
--- a/ReviewBoard.spec
+++ b/ReviewBoard.spec
@@@ -78,7 -77,15 +78,12 @@@ rm -rf $RPM_BUILD_ROO
  %{python_sitelib}/webtests/*.py*
  
  %changelog
+ * Fri Oct 01 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.5-17
+ - Release ReviewBoard 1.5 final
+ - Full release notes:
+ - http://www.reviewboard.org/docs/releasenotes/dev/reviewboard/1.5/
+ 
  * 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.