[fetch-crl/el6: 7/7] Merge branch 'master' into el6

[stevetraylen]

commit 2086af954f0a9b63eaacd956f9f463d8508ebce8
Merge: 85a3ca3 d56a096
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Thu Nov 24 19:38:21 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	fetch-crl.spec
    	sources

 .gitignore     |    7 +------
 fetch-crl.spec |   11 +++++++++--
 sources        |    2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index 20bed68,160467c..31ef73b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,7 +1,1 @@@
--fetch-crl-3.0.0.tar.gz
--/fetch-crl-3.0.3.tar.gz
--/fetch-crl-3.0.4.tar.gz
--/fetch-crl-3.0.5.tar.gz
--/fetch-crl-3.0.6.tar.gz
--/fetch-crl-3.0.7.tar.gz
+ /fetch-crl-3.0.8.tar.gz