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

[cvs]

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

Modified Files:
--------------
    pgadmin3/src/ui/ja_JP:
        pgadmin3.mo (r1.21 -> r1.22)



---------------------------(end of broadcast)---------------------------
TIP 7: don't forget to increase your free space map settings