[pgadmin-hackers] CVS Commit by dpage: Automatic merge using stringmerge script.

[cvs]

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

Modified Files:
--------------
    pgadmin3/src/ui/es_ES:
        pgadmin3.mo (r1.12 -> r1.13)



---------------------------(end of broadcast)---------------------------
TIP 4: Don't 'kill -9' the postmaster