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

[stevetraylen]

commit d07ef5fd5cca6d2b3c80d56d8384a0d3bc844d30
Merge: 26236f1 8ba2432
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Tue Apr 17 16:35:49 2012 +0200

    Merge branch 'master' into el6

 .gitignore                     |    1 +
 myproxy-server-tmpfiles.d.conf |    1 +
 myproxy-server.service         |   18 +++
 myproxy.spec                   |  229 ++++++++++++++++++++++++++--------------
 sources                        |    2 +-
 5 files changed, 169 insertions(+), 82 deletions(-)
---