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

[cvs]

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

Modified Files:
--------------
    pgadmin3/src/ui/fr_FR:
        pgadmin3.mo (r1.45 -> r1.46)



---------------------------(end of broadcast)---------------------------
TIP 5: Have you checked our extensive FAQ?

               http://www.postgresql.org/docs/faqs/FAQ.html