Log Message:
-----------
Automatic merge using stringmerge script.
Modified Files:
--------------
pgadmin3/src/ui/zh_CN:
pgadmin3.mo (r1.15 -> r1.16)
---------------------------(end of broadcast)---------------------------
TIP 3: if posting/reading through Usenet, please send an appropriate
subscribe-nomail command to [EMAIL PROTECTED] so that your
message can get through to the mailing list cleanly
