Log Message:-----------Automatic merge using stringmerge script.
Modified Files:-------------- pgadmin3/src/ui/af_ZA: pgadmin3.mo (r1.10 -> r1.11)