Log Message:
-----------
Automatic merge using stringmerge script.
Modified Files:
--------------
pgadmin3/src/ui/fa_IR:
pgadmin3.mo (r1.20 -> r1.21)---------------------------(end of broadcast)--------------------------- TIP 7: don't forget to increase your free space map settings
