DIRACGrid/WebAppDIRAC — pull request #15 by zmathe (2013-05-08 14:23:38+00:00)
Title: try to avoid conflicts:)

I hope this time will work.