[myproxy/el5: 30/32] Merge remote-tracking branch 'origin/el6'

[Mattias Ellert]

commit fd29bca2f72865845d05e7e3986af5b380813554
Merge: 8faf7f6 c561f86
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Wed Jan 22 21:38:00 2014 +0100

    Merge remote-tracking branch 'origin/el6'

 .gitignore |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---