[myproxy/el6: 3/3] Merge branch 'master' into el6

[stevetraylen]

commit 26236f1a6d273697308bdd8918c42b9f48d145af
Merge: 898b4dd f65c943
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Sat Oct 1 21:19:25 2011 +0200

    Merge branch 'master' into el6

 .gitignore                      |    1 +
 myproxy-globus-7129-ptII.patch  |   30 -----------
 myproxy-globus-7129-ptIII.patch |   57 --------------------
 myproxy-globus-7129.patch       |  110 ---------------------------------------
 myproxy.init                    |    2 +-
 myproxy.spec                    |   17 +++----
 myproxy.sysconfig               |    2 +-
 sources                         |    2 +-
 8 files changed, 11 insertions(+), 210 deletions(-)
---
diff --cc .gitignore
index a6f74ec,50b5f6f..1875dc9
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,3 @@@
 -myproxy-5.2.tar.gz
  /myproxy-5.3.tar.gz
  /myproxy-5.4.tar.gz
+ /myproxy-5.5.tar.gz