[mrbs: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/mrbs

[Xavier Bachelot]

commit 50124a9fed220152b582ec5daf8a7755f30b1a45
Merge: 1049837 698a915
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Tue Mar 1 23:37:07 2011 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/mrbs
    
    Conflicts:
    	mrbs.spec

 mrbs.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc mrbs.spec
index 9ad9eca,af15e30..db70fa6
--- a/mrbs.spec
+++ b/mrbs.spec
@@@ -86,9 -86,9 +86,12 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 +* Fri Feb 11 2011 Xavier Bachelot <xavier at bachelot.org> 1.4.6-1
 +- Update to 1.4.6.
 +
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.5-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Fri Dec 03 2010 Xavier Bachelot <xavier at bachelot.org> 1.4.5-1
  - Update to 1.4.5.