DIRACGrid/DIRAC — pull request #2028 by andresailer (2014-08-03 16:37:59+00:00)
Title: remove remaining merge conflict

I think this part should have remained?

Pro-Tip: use emacs smerge-mode :)