DIRACGrid/DIRAC — pull request #2027 by andresailer (2014-08-03 16:30:51+00:00)
Title: Update FileCatalogDB.sql

Remove merge diff markers