[R-affydata/f14: 5/5] Merge branch 'master' into f14

[Pierre-YvesChibon]

commit 15914f7ade0696086db1c46cf488b1ee0f50367b
Merge: d6a8fd5 0f80390
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Nov 3 09:38:03 2011 +0100

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	R-affydata.spec
    	sources

 .gitignore      |    1 +
 R-affydata.spec |   12 +++++++++++-
 sources         |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
---
diff --cc R-affydata.spec
index b256f48,c36111d..396e878
--- a/R-affydata.spec
+++ b/R-affydata.spec
@@@ -72,8 -73,14 +73,17 @@@ rm -rf %{buildroot
  
  
  %changelog
 +* Tue Mar 15 2011 pingou <pingou at pingoured.fr> 1.11.11-1
 +- Update to version 1.11.11
 +
+ * Thu Nov 03 2011 pingou <pingou at pingoured.fr> 1.11.15-1
+ - Update to version 1.11.15
+ 
+ * Tue Mar 15 2011 pingou <pingou at pingoured.fr> 1.11.11-1
+ - Update to version 1.11.11
+ 
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.10-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Tue May 11 2010 Sandro Mathys <red at fedoraproject.org> - 1.11.10-1
  - initial package