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

[cvs]

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

Modified Files:
--------------
    pgadmin3/src/ui/sr_YU:
        pgadmin3.mo (r1.6 -> r1.7)



---------------------------(end of broadcast)---------------------------
TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]