[mrbs/el5/master: 8/8] Merge branch 'master' into el5

[Xavier Bachelot]

commit 83157857c8ef61e5056afa79d1b6281e003912ed
Merge: 224c3d8 50124a9
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Mon Apr 11 23:45:24 2011 +0200

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

 mrbs.spec |   16 ++++++++++++++++
 sources   |    4 ++++
 2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --cc mrbs.spec
index 8bf47a9,db70fa6..0379d0d
--- a/mrbs.spec
+++ b/mrbs.spec
@@@ -1,5 -1,5 +1,9 @@@
  Name:           mrbs
++<<<<<<< HEAD
 +Version:        1.4.4.1
++=======
+ Version:        1.4.6
++>>>>>>> master
  Release:        1%{?dist}
  Summary:        Meeting Room Booking System
  
@@@ -86,6 -86,15 +90,18 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
++<<<<<<< HEAD
++=======
+ * 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.
+ 
++>>>>>>> master
  * Tue Jun 02 2010 Xavier Bachelot <xavier at bachelot.org> 1.4.4.1-1
  - Update to 1.4.4.1.
  
diff --cc sources
index 428adc7,0d1a6c7..f56e619
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +c7bd67d73e7d6d4049edc7b6011130bd  mrbs-1.4.4.1.tar.gz
++=======
+ a09e27f54a90ae8db4011c3d05101304  mrbs-1.4.6.tar.gz
++>>>>>>> master