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

[stevetraylen]

commit 323c5b369f504d41570fee9636306600294601e8
Merge: 072587d fc0d8fc
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Dec 19 13:43:36 2012 +0100

    Merge branch 'master' into el6

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