[myproxy/el5: 6/6] Merge branch 'master' into el5

[stevetraylen]

commit 359b886f0608e5649366ce36ba3ddcf83509aa8c
Merge: 7ab994c fc0d8fc
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Dec 19 13:44:03 2012 +0100

    Merge branch 'master' into el5

 .gitignore   |    1 +
 myproxy.spec |   54 +++++++++++++++++++++++++++++++-----------------------
 sources      |    2 +-
 3 files changed, 33 insertions(+), 24 deletions(-)
---