CVS Commit by dpage: Automatic merge using stringmerge script.

[cvs(at)cvs(dot)pgadmin(dot)org]

Log Message:
-----------
Automatic merge using stringmerge script.

Modified Files:
--------------
    pgadmin3/src/ui/da_DK:
        pgadmin3.mo (r1.11 -> r1.12)