[libtiger/el5: 5/5] Merge branch 'el6' into el5

[Nicolas Chauvet]

commit 0a58b6c07229e9d1b9d4a6b6847d6b3d8ba23998
Merge: f4dcb04 747572c
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Sun Apr 22 21:39:20 2012 +0200

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	libtiger.spec
    	sources

 .gitignore    |    4 ++++
 libtiger.spec |   10 ++++++++--
 sources       |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 2ad464d,e39e56a..5aeb90a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,5 @@@
  libtiger-0.3.3.tar.gz
++<<<<<<< HEAD
++=======
+ /libtiger-0.3.4.tar.gz
++>>>>>>> el6