DIRACGrid/DIRAC — pull request #1742 by atsareg (2013-12-04 18:38:52+00:00)
Title: Resolve conflicts in #1741

Superseeds #1741