[RBTools/el6/master: 7/7] Merge branch 'master' into el6

[Stephen Gallagher]

commit 5be25ac0e14ecd8222b98f07434d3c3ff536635b
Merge: e236127 6b69cf3
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Feb 1 13:55:37 2011 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	RBTools.spec
    	sources

 .gitignore   |    3 ++-
 RBTools.spec |   18 ++++++++++++++----
 sources      |    2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index c290b6d,8816c66..c2561fd
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,2 @@@
--RBTools-0.2.tar.gz
++/RBTools-0.2.tar.gz
+ /RBTools-0.3.tar.gz
diff --cc RBTools.spec
index 685f001,953fceb..9f9d154
--- a/RBTools.spec
+++ b/RBTools.spec
@@@ -60,7 -60,17 +60,17 @@@ rm -rf $RPM_BUILD_ROO
  %{python_sitelib}/RBTools*.egg-info/
  
  %changelog
+ * Tue Feb 01 2011 Stephen Gallagher <sgallagh at redhat.com> - 0.3-1
+ - New upstream release
+ - Support for new ReviewBoard 1.5.x API
+ - Support for Plastic SCM
+ - Full release notes:
+ - http://www.reviewboard.org/docs/releasenotes/dev/rbtools/0.3/
+ 
+ * Fri Jul 30 2010 Stephen Gallagher <sgallagh at redhat.com> - 0.2-6
+ - Rebuild for python 2.7
+ 
 -* Mon Apr 19 2010 Stephen Gallagher <sgallagh at redhat.com> - 0.2-5
 +* Tue Apr 20 2010 Stephen Gallagher <sgallagh at redhat.com> - 0.2-5
  - Update to 0.2 final release
  
  * Tue Apr 06 2010 Stephen Gallagher <sgallagh at redhat.com> - 0.2-3.rc1