[uberftp/el6/master: 5/5] Merge branch 'master' into el6

[stevetraylen]

commit f935e5b4001a9b32412fa8117c8790c0db5defbd
Merge: 5d5ea8c b7c9747
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Thu Aug 5 21:13:15 2010 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    
    	.gitignore

 .gitignore   |    2 +-
 sources      |    2 +-
 uberftp.spec |    7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 27a4e69,76ffc33..d206d9e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--uberftp-client-2.5.tar.gz
+ uberftp-client-2.6.tar.gz