Log Message:-----------Automatic merge using stringmerge script.
Modified Files:-------------- pgadmin3/src/ui/nb_NO: pgadmin3.mo (r1.12 -> r1.13)