[R-timeDate/f15] Update to 2160.96

[Pierre-YvesChibon]

commit a2c65b466c3333c1fa23bfdc75bae8f02841bad2
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Apr 26 16:11:46 2012 +0200

    Update to 2160.96

 .gitignore      |    5 ++---
 R-timeDate.spec |    7 +++++--
 sources         |    2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fa47a60..3171fd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 timeDate_2120.90.tar.gz
-<<<<<<< HEAD
-=======
 /timeDate_2130.92.tar.gz
 /timeDate_2130.93.tar.gz
->>>>>>> b606e68... Update to 2130.93
+/timeDate_2131.00.tar.gz
+/timeDate_2160.96.tar.gz
diff --git a/R-timeDate.spec b/R-timeDate.spec
index 97a010d..81ea140 100644
--- a/R-timeDate.spec
+++ b/R-timeDate.spec
@@ -1,8 +1,8 @@
 %global packname  timeDate
 
 Name:             R-%{packname}
-Version:          2131.00
-Release:          1%{dist}
+Version:          2160.96
+Release:          1%{?dist}
 Summary:          Rmetrics - chronological and calendrical objects
 
 Group:            Applications/Engineering 
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Apr 26 2012 pingou <pingou at pingoured.fr> 2160.96-1
+- Update to version 2160.96
+
 * Wed Nov  9 2011 Tom Callaway <spot at fedoraproject.org> 2131.00-1
 - update to 2131.00
 
diff --git a/sources b/sources
index 70a190d..d4377d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b2ba2a3ae0e80247b26f875090bbaa53  timeDate_2131.00.tar.gz
+0313f0dc02a4c3502faf1fb8d98e3f9d  timeDate_2160.96.tar.gz