[Fusionforge-commits] r15559 - in trunk: . src/common/include src/common/widget src/db src/debian src/debian/dsf-in src/packaging/control src/packaging/install src/plugins/mediawiki src/plugins/mediawiki/debian src/plugins/projectimport src/utils src/www/pm/include src/www/tabber tests tests/func tests/func/Soap

Roland Mas lolando at fusionforge.org
Wed May 23 15:21:34 CEST 2012


Author: lolando
Date: 2012-05-23 15:21:33 +0200 (Wed, 23 May 2012)
New Revision: 15559

Added:
   trunk/src/debian/dsf-in/db-postgresql.postrm
   trunk/src/plugins/mediawiki/debian/
   trunk/src/utils/ffcountries.pl
   trunk/src/utils/list-projects-using-plugin.php
Modified:
   trunk/
   trunk/src/common/include/RBAC.php
   trunk/src/common/widget/WidgetLayout.class.php
   trunk/src/db/200403251.sql
   trunk/src/debian/changelog
   trunk/src/debian/control
   trunk/src/debian/dsf-in/db-postgresql.postinst.dsfh-in
   trunk/src/debian/dsf-in/db-postgresql.prerm
   trunk/src/debian/rules
   trunk/src/packaging/control/000source
   trunk/src/packaging/install/common
   trunk/src/packaging/install/db-postgresql
   trunk/src/plugins/mediawiki/debian/plugin-mediawiki.postinst
   trunk/src/plugins/mediawiki/debian/plugin-mediawiki.triggers
   trunk/src/plugins/projectimport/INSTALL
   trunk/src/www/pm/include/ProjectGroupHTML.class.php
   trunk/src/www/tabber/example-ajax.html
   trunk/src/www/tabber/example-cookies.html
   trunk/src/www/tabber/example2.html
   trunk/tests/AllFullTests.php
   trunk/tests/AllTests.php
   trunk/tests/DEBDebian60Tests.php
   trunk/tests/SeleniumTests.php
   trunk/tests/func/AllTests.php
   trunk/tests/func/Soap/AllTests.php
Log:
Merged from 5.1/5.2: many fixes, new Debian uploads


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/tracker_attachement_move_in_fs:14977-14978
/trunk:8721-8727
/shelves/aljeux:15005,15012,15150,15154-15160,15177-15179,15203,15232,15276-15277,15306
/branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567,7577,7623-7624,7638,7659-7660,7662,7665,7668,7674,7699,7746-7748,7771,7774,7786,7838
/shelves/alain_peyrat:14997-15003
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7478,7480,7485,7490-7492,7505,7540,7556-7560,7568,7570-7571,7573,7576,7580,7609-7611,7613,7615,7618,7621-7622,7625-7627,7639,7658,7661,7663-7664,7666-7667,7673,7675,7678,7680,7685,7688-7689,7693,7700,7706-7708,7713,7725,7728-7742,7760,7763-7764,7767,7769-7770,7773,7776,7784-7785,7791,7797,7799,7802-7808,7810-7811,7816,7818,7825-7828,7839,7846-7847,7850,7894,7902,7920-7922,7927-7928,7932,7936-7937,7939,7942,7944-7945,7947,7951,7956,7958,7960,8064,8079-8080,8108,8113,8119,8121,8127-8128,8145,8197,8201-8202,8216,8224,8226,8228,8247-8250,8252,8271-8272,8310-8311,8328,8337,8339-8357,8361,8371,8373-8375,8378-8379,8383-8396,8415,8427-8431,8438-8441,8449,8452-8453,8458,8461,8477-8478,8480,8482,8492,8514,8530,8604-8605,8608,8637,8662,8674,8751,8754,8756,8760-8761,8812,8850,8945,8995,8998,9004-9006,9124,9137,9141,9317,9443,9469,9670,9701,9726,9934,10013,10310,10314,10366,12790,13085
/branches/Branch_5_2:15217,15219,15221,15224,15227-15229,15234,15239,15279,15286,15325,15328-15329,15331,15347-15348,15352,15356,15359,15362,15364-15365,15370,15374,15381,15383,15386,15389,15392,15398,15400-15401,15404-15405,15407-15411,15495,15497,15500,15503-15505,15531,15533-15536,15538
/branches/Branch_5_1:11607-11609,11621,11625,11627,11631,11638,11644,11647-11651,11677,11680-11681,11683-11684,11719-11720,11724,11754,11780,11783,11792,11794,11802,11808-11816,11818,11822-11824,11827-11829,11834-11835,11847,11849,11851-11852,11855,11858,11862,11867,11869-11872,11876,11880,11893,11902-11905,11915,11923-11927,11929-11930,11932,11934-11941,11943,11948-11949,11952-11954,11956-11960,11962,11965-11966,11972,11975,11980,11983-11984,11986-11987,11990,11992-11997,12003-12004,12010-12013,12015,12018-12024,12043-12044,12046-12061,12063,12065,12070,12073-12076,12081-12083,12093-12094,12102,12105,12118,12124,12127-12128,12139,12141,12143,12148-12149,12153,12157-12159,12168-12169,12175-12180,12190,12194-12198,12203,12208-12213,12217-12258,12262,12264-12266,12274-12277,12281-12282,12287-12290,12340,12345-12346,12352,12359,12472-12473,12594,12634,12636-12638,12658-12659,12684-12712,12714-12715,12733,12780-12783,12785-12786,12795,12797,12800-12802,12815-12816,12840-12856,12860,12882-12883,12888-12892,12897,12904,12914-12917,12922-12926,12929-12936,12939,12959-12965,12967-12971,13011,13022,13025,13031-13032,13034,13043-13046,13048-13050,13053,13056,13058,13061,13068-13070,13075,13088,13090-13091,13101,13103-13104,13106,13108-13109,13111-13114,13116-13117,13120,13125,13127-13128,13148,13153-13161,13163,13165-13166,13174-13175,13188,13190,13211-13212,13219,13221,13231-13234,13236-13238,13253,13257-13270,13272-13274,13287-13300,13302-13342,13355-13374,13377-13379,13386-13389,13391-13400,13404,13408,13410,13412,13415-13416,13420,13422-13426,13429-13432,13452,13456,13461-13464,13466,13468-13470,13472-13477,13492,13517-13519,13527-13532,13589-13590,13624-13628,13645,13661-13663,13666,13684,13689-13690,13697,13699,13704,13745,13761,13766-13767,13769-13770,13772-13801,13808,13817-13818,13820-13823,13830-13831,13838,13854,13861,13984,13986-13988,14009,14013-14015,14020-14021,14036,14039-14045,14047,14051-14053,14056-14059,14065,14072,14080-14084,14086-14090,14095-14099,14101-14121,14130-14136,14162-14167,14172-14173,14184,14215-14220,14238-14241,14266-14269,14273-14278,14285,14288-14289,14303,14305,14307,14309,14311,14313-14316,14318-14320,14322,14358,14391-14392,14444-14446,14461-14462,14472,14476-14480,14496,14498,14505-14506,14511,14515,14538-14554,14558-14574,14577-14578,14582-14597,14599-14602,14614-14616,14686-14687,14698,14702,14705,14736,14738,14740,14742-14743,14747,14784-14786,14802-14809,14812-14813,14898-14904,14908-14909,14929-14931,15014-15015,15024-15028,15032,15044-15049,15056-15058,15070,15081-15082,15087,15092-15095,15121-15125,15128-15135,15138-15139,15141,15144,15147-15148,15169-15173,15175,15182,15186-15188,15190,15223,15238,15282,15304,15330,15335,15337,15354,15360-15361,15367-15368,15373,15380,15382,15388,15402-15403,15433,15447-15448,15457,15460,15499,15502,15506-15508,15523-15525,15537
/branches/Branch_5_0:8892,8895,8897-8898,8900,8903-8904,8906-8907,8910,8915,8922,8924,8926,8929,8931-8933,8941,8946,8951,8955,8972-8977,8981,8997,8999,9002,9031-9032,9050,9080-9081,9084-9086,9093-9095,9102-9104,9108,9113-9115,9117-9118,9123,9125,9127-9131,9135-9136,9139,9146,9148-9150,9179-9191,9193-9195,9198,9200,9202,9204,9207,9209,9211,9213,9215,9220-9222,9231,9234-9235,9243,9251,9254,9259,9287,9315,9318,9347-9349,9358,9396,9427,9429,9431-9433,9441-9442,9444-9445,9462,9464,9468,9522-9523,9549,9551-9552,9576-9577,9579,9615,9633-9634,9672-9673,9675-9676,9684,9686-9687,9689,9699,9727,9729,9731,9930-9932,9935,9956,9980,10005-10006,10021,10024,10027,10064,10081-10082,10273,10285,10820-10824,10868,10872,10876-10878,10880,10918,11015,11017,11058-11060,11085-11086,11160-11165,11252-11253,11287,11294,11581,11619-11620,11679,11722-11723,11907,11974,12789,12940,12986,13023-13024,13086,13121-13122,13162,13465,13496,13501,13503,13660

   + /branches/tracker_attachement_move_in_fs:14977-14978
/branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567,7577,7623-7624,7638,7659-7660,7662,7665,7668,7674,7699,7746-7748,7771,7774,7786,7838
/shelves/aljeux:15005,15012,15150,15154-15160,15177-15179,15203,15232,15276-15277,15306
/trunk:8721-8727
/shelves/alain_peyrat:14997-15003
/branches/Branch_5_1:11607-11609,11621,11625,11627,11631,11638,11644,11647-11651,11677,11680-11681,11683-11684,11719-11720,11724,11754,11780,11783,11792,11794,11802,11808-11816,11818,11822-11824,11827-11829,11834-11835,11847,11849,11851-11852,11855,11858,11862,11867,11869-11872,11876,11880,11893,11902-11905,11915,11923-11927,11929-11930,11932,11934-11941,11943,11948-11949,11952-11954,11956-11960,11962,11965-11966,11972,11975,11980,11983-11984,11986-11987,11990,11992-11997,12003-12004,12010-12013,12015,12018-12024,12043-12044,12046-12061,12063,12065,12070,12073-12076,12081-12083,12093-12094,12102,12105,12118,12124,12127-12128,12139,12141,12143,12148-12149,12153,12157-12159,12168-12169,12175-12180,12190,12194-12198,12203,12208-12213,12217-12258,12262,12264-12266,12274-12277,12281-12282,12287-12290,12340,12345-12346,12352,12359,12472-12473,12594,12634,12636-12638,12658-12659,12684-12712,12714-12715,12733,12780-12783,12785-12786,12795,12797,12800-12802,12815-12816,12840-12856,12860,12882-12883,12888-12892,12897,12904,12914-12917,12922-12926,12929-12936,12939,12959-12965,12967-12971,13011,13022,13025,13031-13032,13034,13043-13046,13048-13050,13053,13056,13058,13061,13068-13070,13075,13088,13090-13091,13101,13103-13104,13106,13108-13109,13111-13114,13116-13117,13120,13125,13127-13128,13148,13153-13161,13163,13165-13166,13174-13175,13188,13190,13211-13212,13219,13221,13231-13234,13236-13238,13253,13257-13270,13272-13274,13287-13300,13302-13342,13355-13374,13377-13379,13386-13389,13391-13400,13404,13408,13410,13412,13415-13416,13420,13422-13426,13429-13432,13452,13456,13461-13464,13466,13468-13470,13472-13477,13492,13517-13519,13527-13532,13589-13590,13624-13628,13645,13661-13663,13666,13684,13689-13690,13697,13699,13704,13745,13761,13766-13767,13769-13770,13772-13801,13808,13817-13818,13820-13823,13830-13831,13838,13854,13861,13984,13986-13988,14009,14013-14015,14020-14021,14036,14039-14045,14047,14051-14053,14056-14059,14065,14072,14080-14084,14086-14090,14095-14099,14101-14121,14130-14136,14162-14167,14172-14173,14184,14215-14220,14238-14241,14266-14269,14273-14278,14285,14288-14289,14303,14305,14307,14309,14311,14313-14316,14318-14320,14322,14358,14391-14392,14444-14446,14461-14462,14472,14476-14480,14496,14498,14505-14506,14511,14515,14538-14554,14558-14574,14577-14578,14582-14597,14599-14602,14614-14616,14686-14687,14698,14702,14705,14736,14738,14740,14742-14743,14747,14784-14786,14802-14809,14812-14813,14898-14904,14908-14909,14929-14931,15014-15015,15024-15028,15032,15044-15049,15056-15058,15070,15081-15082,15087,15092-15095,15121-15125,15128-15135,15138-15139,15141,15144,15147-15148,15169-15173,15175,15182,15186-15188,15190,15223,15238,15282,15304,15330,15335,15337,15354,15360-15361,15367-15368,15373,15380,15382,15388,15402-15403,15433,15447-15448,15457,15460,15499,15502,15506-15508,15523-15525,15537,15545,15548,15554-15556
/branches/Branch_5_2:15217,15219,15221,15224,15227-15229,15234,15239,15279,15286,15325,15328-15329,15331,15347-15348,15352,15356,15359,15362,15364-15365,15370,15374,15381,15383,15386,15389,15392,15398,15400-15401,15404-15405,15407-15411,15495,15497,15500,15503-15505,15531,15533-15536,15538,15544,15546,15549,15557-15558
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7478,7480,7485,7490-7492,7505,7540,7556-7560,7568,7570-7571,7573,7576,7580,7609-7611,7613,7615,7618,7621-7622,7625-7627,7639,7658,7661,7663-7664,7666-7667,7673,7675,7678,7680,7685,7688-7689,7693,7700,7706-7708,7713,7725,7728-7742,7760,7763-7764,7767,7769-7770,7773,7776,7784-7785,7791,7797,7799,7802-7808,7810-7811,7816,7818,7825-7828,7839,7846-7847,7850,7894,7902,7920-7922,7927-7928,7932,7936-7937,7939,7942,7944-7945,7947,7951,7956,7958,7960,8064,8079-8080,8108,8113,8119,8121,8127-8128,8145,8197,8201-8202,8216,8224,8226,8228,8247-8250,8252,8271-8272,8310-8311,8328,8337,8339-8357,8361,8371,8373-8375,8378-8379,8383-8396,8415,8427-8431,8438-8441,8449,8452-8453,8458,8461,8477-8478,8480,8482,8492,8514,8530,8604-8605,8608,8637,8662,8674,8751,8754,8756,8760-8761,8812,8850,8945,8995,8998,9004-9006,9124,9137,9141,9317,9443,9469,9670,9701,9726,9934,10013,10310,10314,10366,12790,13085
/branches/Branch_5_0:8892,8895,8897-8898,8900,8903-8904,8906-8907,8910,8915,8922,8924,8926,8929,8931-8933,8941,8946,8951,8955,8972-8977,8981,8997,8999,9002,9031-9032,9050,9080-9081,9084-9086,9093-9095,9102-9104,9108,9113-9115,9117-9118,9123,9125,9127-9131,9135-9136,9139,9146,9148-9150,9179-9191,9193-9195,9198,9200,9202,9204,9207,9209,9211,9213,9215,9220-9222,9231,9234-9235,9243,9251,9254,9259,9287,9315,9318,9347-9349,9358,9396,9427,9429,9431-9433,9441-9442,9444-9445,9462,9464,9468,9522-9523,9549,9551-9552,9576-9577,9579,9615,9633-9634,9672-9673,9675-9676,9684,9686-9687,9689,9699,9727,9729,9731,9930-9932,9935,9956,9980,10005-10006,10021,10024,10027,10064,10081-10082,10273,10285,10820-10824,10868,10872,10876-10878,10880,10918,11015,11017,11058-11060,11085-11086,11160-11165,11252-11253,11287,11294,11581,11619-11620,11679,11722-11723,11907,11974,12789,12940,12986,13023-13024,13086,13121-13122,13162,13465,13496,13501,13503,13660

Modified: svk:merge
   - 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7623
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7624
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7838
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:10013
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7476
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7480
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7505
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7540
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7557
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7559
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7560
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7580
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7609
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7615
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7618
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7622
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7626
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7708
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7713
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7725
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7730
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7732
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7734
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7737
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7739
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7760
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7763
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7764
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7767
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7773
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7776
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7784
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7785
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7797
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7799
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7811
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7826
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7827
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7828
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7839
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7951
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7958
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8108
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8113
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8119
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8128
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8145
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8216
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8224
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8226
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8250
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8337
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8357
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8371
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8375
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8379
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8415
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8431
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8441
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8449
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8453
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8530
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8604
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8605
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8608
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8637
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8751
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8756
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8761
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:9141
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10006
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10021
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10064
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10082
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10824
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11017
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11060
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11165
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11253
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11294
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8895
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8898
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8900
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8941
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9115
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9118
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9131
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9136
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9139
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9150
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9188
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9195
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9198
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9207
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9209
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9213
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9243
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9254
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9358
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9433
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9549
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9552
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9579
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9634
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9675
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9676
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9932
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9980
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11631
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11638
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11651
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11684
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11724
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11754
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11794
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11802
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11818
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11835
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11855
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11858
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11872
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11876
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11905
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11930
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11932
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11941
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11962
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11966
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11975
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11980
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11984
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11987
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11997
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12013
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12015
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12022
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12049
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12060
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12073
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12105
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12118
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12143
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12169
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12180
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12190
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12203
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12266
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12282
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12594
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12634
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12659
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12715
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12816
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12843
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12856
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12892
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12917
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12971
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13011
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13056
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13058
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13061
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13091
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13104
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13117
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13120
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13128
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13163
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13190
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13212
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13232
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13238
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13274
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13287
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13300
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13307
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13312
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13314
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13316
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13325
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13373
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13404
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13412
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13426
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13432
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13466
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13492
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13532
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13590
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13690
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13699
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13704
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13761
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13770
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13808
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13821
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13822
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13823
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13854
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13986
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13988
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14021
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14045
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14047
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14053
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14057
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14065
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14072
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14084
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14090
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14109
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14111
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14112
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14113
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14115
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14116
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14119
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14121
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14130
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14136
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14162
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14167
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14173
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14184
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14215
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14218
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14220
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14241
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14269
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14275
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14278
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14289
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14303
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14305
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14307
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14309
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14311
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14320
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14322
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14392
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14462
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14472
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14498
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14515
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14541
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14550
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14554
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14616
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14705
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14743
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14747
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14785
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14805
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14806
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14809
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14813
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14904
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14909
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14931
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15028
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15032
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15049
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15056
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15058
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15070
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15082
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15087
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15092
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15093
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15095
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15125
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15135
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15139
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15141
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15144
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15148
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15175
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15182
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15190
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15219
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15221
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15224
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15229
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15239
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15286
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15331
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15356
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15370
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15374
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15383
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15386
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15389
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15392
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15405
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15411
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15538
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/trunk:8727

   + 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7623
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7624
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7838
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:10013
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7476
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7480
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7505
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7540
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7557
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7559
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7560
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7580
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7609
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7615
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7618
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7622
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7626
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7708
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7713
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7725
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7730
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7732
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7734
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7737
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7739
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7760
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7763
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7764
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7767
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7773
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7776
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7784
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7785
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7797
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7799
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7811
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7826
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7827
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7828
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7839
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7951
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7958
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8108
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8113
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8119
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8128
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8145
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8216
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8224
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8226
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8250
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8337
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8357
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8371
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8375
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8379
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8415
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8431
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8441
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8449
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8453
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8530
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8604
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8605
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8608
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8637
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8751
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8756
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8761
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:9141
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10006
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10021
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10064
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10082
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10824
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11017
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11060
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11165
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11253
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11294
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8895
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8898
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8900
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8941
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9115
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9118
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9131
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9136
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9139
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9150
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9188
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9195
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9198
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9207
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9209
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9213
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9243
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9254
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9358
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9433
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9549
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9552
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9579
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9634
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9675
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9676
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9932
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9980
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11631
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11638
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11651
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11684
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11724
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11754
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11794
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11802
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11818
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11835
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11855
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11858
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11872
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11876
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11905
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11930
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11932
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11941
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11962
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11966
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11975
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11980
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11984
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11987
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11997
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12013
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12015
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12022
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12049
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12060
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12073
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12105
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12118
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12143
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12169
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12180
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12190
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12203
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12266
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12282
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12594
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12634
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12659
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12715
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12816
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12843
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12856
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12892
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12917
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12971
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13011
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13056
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13058
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13061
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13091
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13104
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13117
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13120
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13128
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13163
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13190
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13212
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13232
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13238
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13274
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13287
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13300
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13307
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13312
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13314
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13316
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13325
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13373
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13404
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13412
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13426
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13432
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13466
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13492
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13532
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13590
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13690
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13699
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13704
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13761
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13770
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13808
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13821
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13822
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13823
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13854
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13986
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13988
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14021
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14045
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14047
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14053
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14057
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14065
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14072
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14084
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14090
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14109
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14111
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14112
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14113
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14115
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14116
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14119
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14121
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14130
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14136
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14162
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14167
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14173
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14184
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14215
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14218
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14220
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14241
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14269
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14275
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14278
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14289
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14303
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14305
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14307
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14309
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14311
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14320
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14322
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14392
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14462
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14472
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14498
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14515
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14541
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14550
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14554
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14616
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14705
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14743
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14747
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14785
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14805
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14806
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14809
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14813
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14904
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14909
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14931
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15028
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15032
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15049
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15056
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15058
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15070
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15082
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15087
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15092
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15093
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15095
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15125
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15135
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15139
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15141
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15144
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15148
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15175
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15182
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15190
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15219
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15221
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15224
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15229
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15239
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15286
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15331
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15356
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15370
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15374
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15383
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15386
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15389
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15392
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15405
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15411
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15538
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15558
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/trunk:8727


Modified: trunk/src/common/include/RBAC.php
===================================================================
--- trunk/src/common/include/RBAC.php	2012-05-23 13:08:22 UTC (rev 15558)
+++ trunk/src/common/include/RBAC.php	2012-05-23 13:21:33 UTC (rev 15559)
@@ -194,6 +194,7 @@
 	}
 
 	function linkProject ($project) { // From the PFO spec
+		global $SYS;
 		$hp = $this->getHomeProject();
 		if ($hp != NULL && $hp->getID() == $project->getID()) {
 			$this->setError(_("Can't link to home project"));
@@ -217,10 +218,18 @@
 
 		$this->normalizeData();
 
+		foreach ($this->getUsers() as $u) {
+			if (!$SYS->sysCheckCreateUser($u->getID())) {
+				$this->setError($SYS->getErrorMessage());
+				return false;
+			}
+		}
+
 		return true ;
 	}
 
 	function unlinkProject($project) { // From the PFO spec
+		global $SYS;
 		$hp = $this->getHomeProject();
 		if ($hp != NULL && $hp->getID() == $project->getID()) {
 			$this->setError (_("Can't unlink from home project"));
@@ -237,6 +246,13 @@
 
 		$this->removeObsoleteSettings ();
 
+		foreach ($this->getUsers() as $u) {
+			if (!$SYS->sysCheckCreateUser($u->getID())) {
+				$this->setError($SYS->getErrorMessage());
+				return false;
+			}
+		}
+
 		return true ;
 	}
 
@@ -708,15 +724,6 @@
 		foreach ($data as $sect => $refs) {
 			foreach ($refs as $refid => $value) {
 				$this->setSetting ($sect, $refid, $value) ;
-				if ($sect == 'scm') {
-					foreach ($this->getUsers() as $u) {
-						if (!$SYS->sysGroupCheckUser($refid,$u->getID())) {
-							$this->setError($SYS->getErrorMessage());
-							db_rollback();
-							return false;
-						}
-					}
-				}
 			}
 		}
 
@@ -729,6 +736,14 @@
 
 		db_commit();
 		$this->fetchData($this->getID());
+
+		foreach ($this->getUsers() as $u) {
+			if (!$SYS->sysCheckCreateUser($u->getID())) {
+				$this->setError($SYS->getErrorMessage());
+				return false;
+			}
+		}
+
 		return true;
 	}
 
@@ -768,6 +783,7 @@
 					'forum')) ;
 
 		db_commit () ;
+		$this->fetchData($this->getID());
 		return true ;
 	}
 

Modified: trunk/src/db/200403251.sql
===================================================================
--- trunk/src/db/200403251.sql	2012-05-23 13:08:22 UTC (rev 15558)
+++ trunk/src/db/200403251.sql	2012-05-23 13:21:33 UTC (rev 15559)
@@ -6,246 +6,256 @@
 UPDATE USERS SET ccode='US',firstname=realname WHERE firstname is null;
 
 CREATE TABLE country_code (
-country_name varchar(80),
-ccode char(2) primary key
+	country_name varchar(80),
+	ccode char(2) primary key
 );
 
-INSERT INTO country_code VALUES ('AFGHANISTAN','AF');
-INSERT INTO country_code VALUES ('ALBANIA','AL');
-INSERT INTO country_code VALUES ('ALGERIA','DZ');
-INSERT INTO country_code VALUES ('AMERICAN SAMOA','AS');
-INSERT INTO country_code VALUES ('ANDORRA','AD');
-INSERT INTO country_code VALUES ('ANGOLA','AO');
-INSERT INTO country_code VALUES ('ANGUILLA','AI');
-INSERT INTO country_code VALUES ('ANTARCTICA','AQ');
-INSERT INTO country_code VALUES ('ANTIGUA AND BARBUDA','AG');
-INSERT INTO country_code VALUES ('ARGENTINA','AR');
-INSERT INTO country_code VALUES ('ARMENIA','AM');
-INSERT INTO country_code VALUES ('ARUBA','AW');
-INSERT INTO country_code VALUES ('AUSTRALIA','AU');
-INSERT INTO country_code VALUES ('AUSTRIA','AT');
-INSERT INTO country_code VALUES ('AZERBAIJAN','AZ');
-INSERT INTO country_code VALUES ('BAHAMAS','BS');
-INSERT INTO country_code VALUES ('BAHRAIN','BH');
-INSERT INTO country_code VALUES ('BANGLADESH','BD');
-INSERT INTO country_code VALUES ('BARBADOS','BB');
-INSERT INTO country_code VALUES ('BELARUS','BY');
-INSERT INTO country_code VALUES ('BELGIUM','BE');
-INSERT INTO country_code VALUES ('BELIZE','BZ');
-INSERT INTO country_code VALUES ('BENIN','BJ');
-INSERT INTO country_code VALUES ('BERMUDA','BM');
-INSERT INTO country_code VALUES ('BHUTAN','BT');
-INSERT INTO country_code VALUES ('BOLIVIA','BO');
-INSERT INTO country_code VALUES ('BOSNIA AND HERZEGOVINA','BA');
-INSERT INTO country_code VALUES ('BOTSWANA','BW');
-INSERT INTO country_code VALUES ('BOUVET ISLAND','BV');
-INSERT INTO country_code VALUES ('BRAZIL','BR');
-INSERT INTO country_code VALUES ('BRITISH INDIAN OCEAN TERRITORY','IO');
-INSERT INTO country_code VALUES ('BRUNEI DARUSSALAM','BN');
-INSERT INTO country_code VALUES ('BULGARIA','BG');
-INSERT INTO country_code VALUES ('BURKINA FASO','BF');
-INSERT INTO country_code VALUES ('BURUNDI','BI');
-INSERT INTO country_code VALUES ('CAMBODIA','KH');
-INSERT INTO country_code VALUES ('CAMEROON','CM');
-INSERT INTO country_code VALUES ('CANADA','CA');
-INSERT INTO country_code VALUES ('CAPE VERDE','CV');
-INSERT INTO country_code VALUES ('CAYMAN ISLANDS','KY');
-INSERT INTO country_code VALUES ('CENTRAL AFRICAN REPUBLIC','CF');
-INSERT INTO country_code VALUES ('CHAD','TD');
-INSERT INTO country_code VALUES ('CHILE','CL');
-INSERT INTO country_code VALUES ('CHINA','CN');
-INSERT INTO country_code VALUES ('CHRISTMAS ISLAND','CX');
-INSERT INTO country_code VALUES ('COCOS (KEELING) ISLANDS','CC');
-INSERT INTO country_code VALUES ('COLOMBIA','CO');
-INSERT INTO country_code VALUES ('COMOROS','KM');
-INSERT INTO country_code VALUES ('CONGO','CG');
-INSERT INTO country_code VALUES ('CONGO, THE DEMOCRATIC REPUBLIC OF THE','CD');
-INSERT INTO country_code VALUES ('COOK ISLANDS','CK');
-INSERT INTO country_code VALUES ('COSTA RICA','CR');
-INSERT INTO country_code VALUES ('COTE D\'IVOIRE','CI');
-INSERT INTO country_code VALUES ('CROATIA','HR');
-INSERT INTO country_code VALUES ('CUBA','CU');
-INSERT INTO country_code VALUES ('CYPRUS','CY');
-INSERT INTO country_code VALUES ('CZECH REPUBLIC','CZ');
-INSERT INTO country_code VALUES ('DENMARK','DK');
-INSERT INTO country_code VALUES ('DJIBOUTI','DJ');
-INSERT INTO country_code VALUES ('DOMINICA','DM');
-INSERT INTO country_code VALUES ('DOMINICAN REPUBLIC','DO');
-INSERT INTO country_code VALUES ('EAST TIMOR','TP');
-INSERT INTO country_code VALUES ('ECUADOR','EC');
-INSERT INTO country_code VALUES ('EGYPT','EG');
-INSERT INTO country_code VALUES ('EL SALVADOR','SV');
-INSERT INTO country_code VALUES ('EQUATORIAL GUINEA','GQ');
-INSERT INTO country_code VALUES ('ERITREA','ER');
-INSERT INTO country_code VALUES ('ESTONIA','EE');
-INSERT INTO country_code VALUES ('ETHIOPIA','ET');
-INSERT INTO country_code VALUES ('FALKLAND ISLANDS (MALVINAS)','FK');
-INSERT INTO country_code VALUES ('FAROE ISLANDS','FO');
-INSERT INTO country_code VALUES ('FIJI','FJ');
-INSERT INTO country_code VALUES ('FINLAND','FI');
-INSERT INTO country_code VALUES ('FRANCE','FR');
-INSERT INTO country_code VALUES ('FRENCH GUIANA','GF');
-INSERT INTO country_code VALUES ('FRENCH POLYNESIA','PF');
-INSERT INTO country_code VALUES ('FRENCH SOUTHERN TERRITORIES','TF');
-INSERT INTO country_code VALUES ('GABON','GA');
-INSERT INTO country_code VALUES ('GAMBIA','GM');
-INSERT INTO country_code VALUES ('GEORGIA','GE');
-INSERT INTO country_code VALUES ('GERMANY','DE');
-INSERT INTO country_code VALUES ('GHANA','GH');
-INSERT INTO country_code VALUES ('GIBRALTAR','GI');
-INSERT INTO country_code VALUES ('GREECE','GR');
-INSERT INTO country_code VALUES ('GREENLAND','GL');
-INSERT INTO country_code VALUES ('GRENADA','GD');
-INSERT INTO country_code VALUES ('GUADELOUPE','GP');
-INSERT INTO country_code VALUES ('GUAM','GU');
-INSERT INTO country_code VALUES ('GUATEMALA','GT');
-INSERT INTO country_code VALUES ('GUINEA','GN');
-INSERT INTO country_code VALUES ('GUINEA-BISSAU','GW');
-INSERT INTO country_code VALUES ('GUYANA','GY');
-INSERT INTO country_code VALUES ('HAITI','HT');
-INSERT INTO country_code VALUES ('HEARD ISLAND AND MCDONALD ISLANDS','HM');
-INSERT INTO country_code VALUES ('HOLY SEE (VATICAN CITY STATE)','VA');
-INSERT INTO country_code VALUES ('HONDURAS','HN');
-INSERT INTO country_code VALUES ('HONG KONG','HK');
-INSERT INTO country_code VALUES ('HUNGARY','HU');
-INSERT INTO country_code VALUES ('ICELAND','IS');
-INSERT INTO country_code VALUES ('INDIA','IN');
-INSERT INTO country_code VALUES ('INDONESIA','ID');
-INSERT INTO country_code VALUES ('IRAN, ISLAMIC REPUBLIC OF','IR');
-INSERT INTO country_code VALUES ('IRAQ','IQ');
-INSERT INTO country_code VALUES ('IRELAND','IE');
-INSERT INTO country_code VALUES ('ISRAEL','IL');
-INSERT INTO country_code VALUES ('ITALY','IT');
-INSERT INTO country_code VALUES ('JAMAICA','JM');
-INSERT INTO country_code VALUES ('JAPAN','JP');
-INSERT INTO country_code VALUES ('JORDAN','JO');
-INSERT INTO country_code VALUES ('KAZAKSTAN','KZ');
-INSERT INTO country_code VALUES ('KENYA','KE');
-INSERT INTO country_code VALUES ('KIRIBATI','KI');
-INSERT INTO country_code VALUES ('KOREA, DEMOCRATIC PEOPLE\'S REPUBLIC OF','KP');
-INSERT INTO country_code VALUES ('KOREA, REPUBLIC OF','KR');
-INSERT INTO country_code VALUES ('KUWAIT','KW');
-INSERT INTO country_code VALUES ('KYRGYZSTAN','KG');
-INSERT INTO country_code VALUES ('LAO PEOPLE\'S DEMOCRATIC REPUBLIC','LA');
-INSERT INTO country_code VALUES ('LATVIA','LV');
-INSERT INTO country_code VALUES ('LEBANON','LB');
-INSERT INTO country_code VALUES ('LESOTHO','LS');
-INSERT INTO country_code VALUES ('LIBERIA','LR');
-INSERT INTO country_code VALUES ('LIBYAN ARAB JAMAHIRIYA','LY');
-INSERT INTO country_code VALUES ('LIECHTENSTEIN','LI');
-INSERT INTO country_code VALUES ('LITHUANIA','LT');
-INSERT INTO country_code VALUES ('LUXEMBOURG','LU');
-INSERT INTO country_code VALUES ('MACAU','MO');
-INSERT INTO country_code VALUES ('MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF','MK');
-INSERT INTO country_code VALUES ('MADAGASCAR','MG');
-INSERT INTO country_code VALUES ('MALAWI','MW');
-INSERT INTO country_code VALUES ('MALAYSIA','MY');
-INSERT INTO country_code VALUES ('MALDIVES','MV');
-INSERT INTO country_code VALUES ('MALI','ML');
-INSERT INTO country_code VALUES ('MALTA','MT');
-INSERT INTO country_code VALUES ('MARSHALL ISLANDS','MH');
-INSERT INTO country_code VALUES ('MARTINIQUE','MQ');
-INSERT INTO country_code VALUES ('MAURITANIA','MR');
-INSERT INTO country_code VALUES ('MAURITIUS','MU');
-INSERT INTO country_code VALUES ('MAYOTTE','YT');
-INSERT INTO country_code VALUES ('MEXICO','MX');
-INSERT INTO country_code VALUES ('MICRONESIA, FEDERATED STATES OF','FM');
-INSERT INTO country_code VALUES ('MOLDOVA, REPUBLIC OF','MD');
-INSERT INTO country_code VALUES ('MONACO','MC');
-INSERT INTO country_code VALUES ('MONGOLIA','MN');
-INSERT INTO country_code VALUES ('MONTSERRAT','MS');
-INSERT INTO country_code VALUES ('MOROCCO','MA');
-INSERT INTO country_code VALUES ('MOZAMBIQUE','MZ');
-INSERT INTO country_code VALUES ('MYANMAR','MM');
-INSERT INTO country_code VALUES ('NAMIBIA','NA');
-INSERT INTO country_code VALUES ('NAURU','NR');
-INSERT INTO country_code VALUES ('NEPAL','NP');
-INSERT INTO country_code VALUES ('NETHERLANDS','NL');
-INSERT INTO country_code VALUES ('NETHERLANDS ANTILLES','AN');
-INSERT INTO country_code VALUES ('NEW CALEDONIA','NC');
-INSERT INTO country_code VALUES ('NEW ZEALAND','NZ');
-INSERT INTO country_code VALUES ('NICARAGUA','NI');
-INSERT INTO country_code VALUES ('NIGER','NE');
-INSERT INTO country_code VALUES ('NIGERIA','NG');
-INSERT INTO country_code VALUES ('NIUE','NU');
-INSERT INTO country_code VALUES ('NORFOLK ISLAND','NF');
-INSERT INTO country_code VALUES ('NORTHERN MARIANA ISLANDS','MP');
-INSERT INTO country_code VALUES ('NORWAY','NO');
-INSERT INTO country_code VALUES ('OMAN','OM');
-INSERT INTO country_code VALUES ('PAKISTAN','PK');
-INSERT INTO country_code VALUES ('PALAU','PW');
-INSERT INTO country_code VALUES ('PALESTINIAN TERRITORY, OCCUPIED','PS');
-INSERT INTO country_code VALUES ('PANAMA','PA');
-INSERT INTO country_code VALUES ('PAPUA NEW GUINEA','PG');
-INSERT INTO country_code VALUES ('PARAGUAY','PY');
-INSERT INTO country_code VALUES ('PERU','PE');
-INSERT INTO country_code VALUES ('PHILIPPINES','PH');
-INSERT INTO country_code VALUES ('PITCAIRN','PN');
-INSERT INTO country_code VALUES ('POLAND','PL');
-INSERT INTO country_code VALUES ('PORTUGAL','PT');
-INSERT INTO country_code VALUES ('PUERTO RICO','PR');
-INSERT INTO country_code VALUES ('QATAR','QA');
-INSERT INTO country_code VALUES ('REUNION','RE');
-INSERT INTO country_code VALUES ('ROMANIA','RO');
-INSERT INTO country_code VALUES ('RUSSIAN FEDERATION','RU');
-INSERT INTO country_code VALUES ('RWANDA','RW');
-INSERT INTO country_code VALUES ('SAINT HELENA','SH');
-INSERT INTO country_code VALUES ('SAINT KITTS AND NEVIS','KN');
-INSERT INTO country_code VALUES ('SAINT LUCIA','LC');
-INSERT INTO country_code VALUES ('SAINT PIERRE AND MIQUELON','PM');
-INSERT INTO country_code VALUES ('SAINT VINCENT AND THE GRENADINES','VC');
-INSERT INTO country_code VALUES ('SAMOA','WS');
-INSERT INTO country_code VALUES ('SAN MARINO','SM');
-INSERT INTO country_code VALUES ('SAO TOME AND PRINCIPE','ST');
-INSERT INTO country_code VALUES ('SAUDI ARABIA','SA');
-INSERT INTO country_code VALUES ('SENEGAL','SN');
-INSERT INTO country_code VALUES ('SEYCHELLES','SC');
-INSERT INTO country_code VALUES ('SIERRA LEONE','SL');
-INSERT INTO country_code VALUES ('SINGAPORE','SG');
-INSERT INTO country_code VALUES ('SLOVAKIA','SK');
-INSERT INTO country_code VALUES ('SLOVENIA','SI');
-INSERT INTO country_code VALUES ('SOLOMON ISLANDS','SB');
-INSERT INTO country_code VALUES ('SOMALIA','SO');
-INSERT INTO country_code VALUES ('SOUTH AFRICA','ZA');
-INSERT INTO country_code VALUES ('SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS','GS');
-INSERT INTO country_code VALUES ('SPAIN','ES');
-INSERT INTO country_code VALUES ('SRI LANKA','LK');
-INSERT INTO country_code VALUES ('SUDAN','SD');
-INSERT INTO country_code VALUES ('SURINAME','SR');
-INSERT INTO country_code VALUES ('SVALBARD AND JAN MAYEN','SJ');
-INSERT INTO country_code VALUES ('SWAZILAND','SZ');
-INSERT INTO country_code VALUES ('SWEDEN','SE');
-INSERT INTO country_code VALUES ('SWITZERLAND','CH');
-INSERT INTO country_code VALUES ('SYRIAN ARAB REPUBLIC','SY');
-INSERT INTO country_code VALUES ('TAIWAN, PROVINCE OF CHINA','TW');
-INSERT INTO country_code VALUES ('TAJIKISTAN','TJ');
-INSERT INTO country_code VALUES ('TANZANIA, UNITED REPUBLIC OF','TZ');
-INSERT INTO country_code VALUES ('THAILAND','TH');
-INSERT INTO country_code VALUES ('TOGO','TG');
-INSERT INTO country_code VALUES ('TOKELAU','TK');
-INSERT INTO country_code VALUES ('TONGA','TO');
-INSERT INTO country_code VALUES ('TRINIDAD AND TOBAGO','TT');
-INSERT INTO country_code VALUES ('TUNISIA','TN');
-INSERT INTO country_code VALUES ('TURKEY','TR');
-INSERT INTO country_code VALUES ('TURKMENISTAN','TM');
-INSERT INTO country_code VALUES ('TURKS AND CAICOS ISLANDS','TC');
-INSERT INTO country_code VALUES ('TUVALU','TV');
-INSERT INTO country_code VALUES ('UGANDA','UG');
-INSERT INTO country_code VALUES ('UKRAINE','UA');
-INSERT INTO country_code VALUES ('UNITED ARAB EMIRATES','AE');
-INSERT INTO country_code VALUES ('UNITED STATES','US');
-INSERT INTO country_code VALUES ('UNITED STATES MINOR OUTLYING ISLANDS','UM');
-INSERT INTO country_code VALUES ('URUGUAY','UY');
-INSERT INTO country_code VALUES ('UZBEKISTAN','UZ');
-INSERT INTO country_code VALUES ('VANUATU','VU');
-INSERT INTO country_code VALUES ('VENEZUELA','VE');
-INSERT INTO country_code VALUES ('VIET NAM','VN');
-INSERT INTO country_code VALUES ('VIRGIN ISLANDS, BRITISH','VG');
-INSERT INTO country_code VALUES ('VIRGIN ISLANDS, U.S.','VI');
-INSERT INTO country_code VALUES ('WALLIS AND FUTUNA','WF');
-INSERT INTO country_code VALUES ('WESTERN SAHARA','EH');
-INSERT INTO country_code VALUES ('YEMEN','YE');
-INSERT INTO country_code VALUES ('YUGOSLAVIA','YU');
-INSERT INTO country_code VALUES ('ZAMBIA','ZM');
-INSERT INTO country_code VALUES ('ZIMBABWE','ZW');
-INSERT INTO country_code VALUES ('UNITED KINGDOM','UK');
+INSERT INTO country_code VALUES ('Afghanistan','AF');
+INSERT INTO country_code VALUES ('Åland Islands','AX');
+INSERT INTO country_code VALUES ('Albania','AL');
+INSERT INTO country_code VALUES ('Algeria','DZ');
+INSERT INTO country_code VALUES ('American Samoa','AS');
+INSERT INTO country_code VALUES ('Andorra','AD');
+INSERT INTO country_code VALUES ('Angola','AO');
+INSERT INTO country_code VALUES ('Anguilla','AI');
+INSERT INTO country_code VALUES ('Antarctica','AQ');
+INSERT INTO country_code VALUES ('Antigua and Barbuda','AG');
+INSERT INTO country_code VALUES ('Argentina','AR');
+INSERT INTO country_code VALUES ('Armenia','AM');
+INSERT INTO country_code VALUES ('Aruba','AW');
+INSERT INTO country_code VALUES ('Australia','AU');
+INSERT INTO country_code VALUES ('Austria','AT');
+INSERT INTO country_code VALUES ('Azerbaijan','AZ');
+INSERT INTO country_code VALUES ('Bahamas','BS');
+INSERT INTO country_code VALUES ('Bahrain','BH');
+INSERT INTO country_code VALUES ('Bangladesh','BD');
+INSERT INTO country_code VALUES ('Barbados','BB');
+INSERT INTO country_code VALUES ('Belarus','BY');
+INSERT INTO country_code VALUES ('Belgium','BE');
+INSERT INTO country_code VALUES ('Belize','BZ');
+INSERT INTO country_code VALUES ('Benin','BJ');
+INSERT INTO country_code VALUES ('Bermuda','BM');
+INSERT INTO country_code VALUES ('Bhutan','BT');
+INSERT INTO country_code VALUES ('Bolivia','BO');
+INSERT INTO country_code VALUES ('Bonaire, Sint Eustatius and Saba','BQ');
+INSERT INTO country_code VALUES ('Bosnia and Herzegovina','BA');
+INSERT INTO country_code VALUES ('Botswana','BW');
+INSERT INTO country_code VALUES ('Bouvet Island','BV');
+INSERT INTO country_code VALUES ('Brazil','BR');
+INSERT INTO country_code VALUES ('British Indian Ocean Territory','IO');
+INSERT INTO country_code VALUES ('Brunei Darussalam','BN');
+INSERT INTO country_code VALUES ('Bulgaria','BG');
+INSERT INTO country_code VALUES ('Burkina Faso','BF');
+INSERT INTO country_code VALUES ('Burundi','BI');
+INSERT INTO country_code VALUES ('Cambodia','KH');
+INSERT INTO country_code VALUES ('Cameroon','CM');
+INSERT INTO country_code VALUES ('Canada','CA');
+INSERT INTO country_code VALUES ('Cape Verde','CV');
+INSERT INTO country_code VALUES ('Cayman Islands','KY');
+INSERT INTO country_code VALUES ('Central African Republic','CF');
+INSERT INTO country_code VALUES ('Chad','TD');
+INSERT INTO country_code VALUES ('Chile','CL');
+INSERT INTO country_code VALUES ('China','CN');
+INSERT INTO country_code VALUES ('Christmas Island','CX');
+INSERT INTO country_code VALUES ('Cocos (Keeling) Islands','CC');
+INSERT INTO country_code VALUES ('Colombia','CO');
+INSERT INTO country_code VALUES ('Comoros','KM');
+INSERT INTO country_code VALUES ('Congo','CG');
+INSERT INTO country_code VALUES ('Congo, The Democratic Republic of the','CD');
+INSERT INTO country_code VALUES ('Cook Islands','CK');
+INSERT INTO country_code VALUES ('Costa Rica','CR');
+INSERT INTO country_code VALUES ('Côte d''Ivoire','CI');
+INSERT INTO country_code VALUES ('Croatia','HR');
+INSERT INTO country_code VALUES ('Cuba','CU');
+INSERT INTO country_code VALUES ('Curaçao','CW');
+INSERT INTO country_code VALUES ('Cyprus','CY');
+INSERT INTO country_code VALUES ('Czech Republic','CZ');
+INSERT INTO country_code VALUES ('Denmark','DK');
+INSERT INTO country_code VALUES ('Djibouti','DJ');
+INSERT INTO country_code VALUES ('Dominica','DM');
+INSERT INTO country_code VALUES ('Dominican Republic','DO');
+INSERT INTO country_code VALUES ('Ecuador','EC');
+INSERT INTO country_code VALUES ('Egypt','EG');
+INSERT INTO country_code VALUES ('El Salvador','SV');
+INSERT INTO country_code VALUES ('Equatorial Guinea','GQ');
+INSERT INTO country_code VALUES ('Eritrea','ER');
+INSERT INTO country_code VALUES ('Estonia','EE');
+INSERT INTO country_code VALUES ('Ethiopia','ET');
+INSERT INTO country_code VALUES ('Falkland Islands (Malvinas)','FK');
+INSERT INTO country_code VALUES ('Faroe Islands','FO');
+INSERT INTO country_code VALUES ('Fiji','FJ');
+INSERT INTO country_code VALUES ('Finland','FI');
+INSERT INTO country_code VALUES ('France','FR');
+INSERT INTO country_code VALUES ('French Guiana','GF');
+INSERT INTO country_code VALUES ('French Polynesia','PF');
+INSERT INTO country_code VALUES ('French Southern Territories','TF');
+INSERT INTO country_code VALUES ('Gabon','GA');
+INSERT INTO country_code VALUES ('Gambia','GM');
+INSERT INTO country_code VALUES ('Georgia','GE');
+INSERT INTO country_code VALUES ('Germany','DE');
+INSERT INTO country_code VALUES ('Ghana','GH');
+INSERT INTO country_code VALUES ('Gibraltar','GI');
+INSERT INTO country_code VALUES ('Greece','GR');
+INSERT INTO country_code VALUES ('Greenland','GL');
+INSERT INTO country_code VALUES ('Grenada','GD');
+INSERT INTO country_code VALUES ('Guadeloupe','GP');
+INSERT INTO country_code VALUES ('Guam','GU');
+INSERT INTO country_code VALUES ('Guatemala','GT');
+INSERT INTO country_code VALUES ('Guernsey','GG');
+INSERT INTO country_code VALUES ('Guinea','GN');
+INSERT INTO country_code VALUES ('Guinea-Bissau','GW');
+INSERT INTO country_code VALUES ('Guyana','GY');
+INSERT INTO country_code VALUES ('Haiti','HT');
+INSERT INTO country_code VALUES ('Heard Island and McDonald Islands','HM');
+INSERT INTO country_code VALUES ('Holy See (Vatican City State)','VA');
+INSERT INTO country_code VALUES ('Honduras','HN');
+INSERT INTO country_code VALUES ('Hong Kong','HK');
+INSERT INTO country_code VALUES ('Hungary','HU');
+INSERT INTO country_code VALUES ('Iceland','IS');
+INSERT INTO country_code VALUES ('India','IN');
+INSERT INTO country_code VALUES ('Indonesia','ID');
+INSERT INTO country_code VALUES ('Iran, Islamic Republic of','IR');
+INSERT INTO country_code VALUES ('Iraq','IQ');
+INSERT INTO country_code VALUES ('Ireland','IE');
+INSERT INTO country_code VALUES ('Isle of Man','IM');
+INSERT INTO country_code VALUES ('Israel','IL');
+INSERT INTO country_code VALUES ('Italy','IT');
+INSERT INTO country_code VALUES ('Jamaica','JM');
+INSERT INTO country_code VALUES ('Japan','JP');
+INSERT INTO country_code VALUES ('Jersey','JE');
+INSERT INTO country_code VALUES ('Jordan','JO');
+INSERT INTO country_code VALUES ('Kazakhstan','KZ');
+INSERT INTO country_code VALUES ('Kenya','KE');
+INSERT INTO country_code VALUES ('Kiribati','KI');
+INSERT INTO country_code VALUES ('Korea, Democratic People''s Republic of','KP');
+INSERT INTO country_code VALUES ('Korea, Republic of','KR');
+INSERT INTO country_code VALUES ('Kuwait','KW');
+INSERT INTO country_code VALUES ('Kyrgyzstan','KG');
+INSERT INTO country_code VALUES ('Lao People''s Democratic Republic','LA');
+INSERT INTO country_code VALUES ('Latvia','LV');
+INSERT INTO country_code VALUES ('Lebanon','LB');
+INSERT INTO country_code VALUES ('Lesotho','LS');
+INSERT INTO country_code VALUES ('Liberia','LR');
+INSERT INTO country_code VALUES ('Libya','LY');
+INSERT INTO country_code VALUES ('Liechtenstein','LI');
+INSERT INTO country_code VALUES ('Lithuania','LT');
+INSERT INTO country_code VALUES ('Luxembourg','LU');
+INSERT INTO country_code VALUES ('Macao','MO');
+INSERT INTO country_code VALUES ('Macedonia, Republic of','MK');
+INSERT INTO country_code VALUES ('Madagascar','MG');
+INSERT INTO country_code VALUES ('Malawi','MW');
+INSERT INTO country_code VALUES ('Malaysia','MY');
+INSERT INTO country_code VALUES ('Maldives','MV');
+INSERT INTO country_code VALUES ('Mali','ML');
+INSERT INTO country_code VALUES ('Malta','MT');
+INSERT INTO country_code VALUES ('Marshall Islands','MH');
+INSERT INTO country_code VALUES ('Martinique','MQ');
+INSERT INTO country_code VALUES ('Mauritania','MR');
+INSERT INTO country_code VALUES ('Mauritius','MU');
+INSERT INTO country_code VALUES ('Mayotte','YT');
+INSERT INTO country_code VALUES ('Mexico','MX');
+INSERT INTO country_code VALUES ('Micronesia, Federated States of','FM');
+INSERT INTO country_code VALUES ('Moldova','MD');
+INSERT INTO country_code VALUES ('Monaco','MC');
+INSERT INTO country_code VALUES ('Mongolia','MN');
+INSERT INTO country_code VALUES ('Montenegro','ME');
+INSERT INTO country_code VALUES ('Montserrat','MS');
+INSERT INTO country_code VALUES ('Morocco','MA');
+INSERT INTO country_code VALUES ('Mozambique','MZ');
+INSERT INTO country_code VALUES ('Myanmar','MM');
+INSERT INTO country_code VALUES ('Namibia','NA');
+INSERT INTO country_code VALUES ('Nauru','NR');
+INSERT INTO country_code VALUES ('Nepal','NP');
+INSERT INTO country_code VALUES ('Netherlands','NL');
+INSERT INTO country_code VALUES ('New Caledonia','NC');
+INSERT INTO country_code VALUES ('New Zealand','NZ');
+INSERT INTO country_code VALUES ('Nicaragua','NI');
+INSERT INTO country_code VALUES ('Niger','NE');
+INSERT INTO country_code VALUES ('Nigeria','NG');
+INSERT INTO country_code VALUES ('Niue','NU');
+INSERT INTO country_code VALUES ('Norfolk Island','NF');
+INSERT INTO country_code VALUES ('Northern Mariana Islands','MP');
+INSERT INTO country_code VALUES ('Norway','NO');
+INSERT INTO country_code VALUES ('Oman','OM');
+INSERT INTO country_code VALUES ('Pakistan','PK');
+INSERT INTO country_code VALUES ('Palau','PW');
+INSERT INTO country_code VALUES ('Palestinian Territory, Occupied','PS');
+INSERT INTO country_code VALUES ('Panama','PA');
+INSERT INTO country_code VALUES ('Papua New Guinea','PG');
+INSERT INTO country_code VALUES ('Paraguay','PY');
+INSERT INTO country_code VALUES ('Peru','PE');
+INSERT INTO country_code VALUES ('Philippines','PH');
+INSERT INTO country_code VALUES ('Pitcairn','PN');
+INSERT INTO country_code VALUES ('Poland','PL');
+INSERT INTO country_code VALUES ('Portugal','PT');
+INSERT INTO country_code VALUES ('Puerto Rico','PR');
+INSERT INTO country_code VALUES ('Qatar','QA');
+INSERT INTO country_code VALUES ('Réunion','RE');
+INSERT INTO country_code VALUES ('Romania','RO');
+INSERT INTO country_code VALUES ('Russian Federation','RU');
+INSERT INTO country_code VALUES ('Rwanda','RW');
+INSERT INTO country_code VALUES ('Saint Barthélemy','BL');
+INSERT INTO country_code VALUES ('Saint Helena, Ascension and Tristan da Cunha','SH');
+INSERT INTO country_code VALUES ('Saint Kitts and Nevis','KN');
+INSERT INTO country_code VALUES ('Saint Lucia','LC');
+INSERT INTO country_code VALUES ('Saint Martin (French part)','MF');
+INSERT INTO country_code VALUES ('Saint Pierre and Miquelon','PM');
+INSERT INTO country_code VALUES ('Saint Vincent and the Grenadines','VC');
+INSERT INTO country_code VALUES ('Samoa','WS');
+INSERT INTO country_code VALUES ('San Marino','SM');
+INSERT INTO country_code VALUES ('Sao Tome and Principe','ST');
+INSERT INTO country_code VALUES ('Saudi Arabia','SA');
+INSERT INTO country_code VALUES ('Senegal','SN');
+INSERT INTO country_code VALUES ('Serbia','RS');
+INSERT INTO country_code VALUES ('Seychelles','SC');
+INSERT INTO country_code VALUES ('Sierra Leone','SL');
+INSERT INTO country_code VALUES ('Singapore','SG');
+INSERT INTO country_code VALUES ('Sint Maarten (Dutch part)','SX');
+INSERT INTO country_code VALUES ('Slovakia','SK');
+INSERT INTO country_code VALUES ('Slovenia','SI');
+INSERT INTO country_code VALUES ('Solomon Islands','SB');
+INSERT INTO country_code VALUES ('Somalia','SO');
+INSERT INTO country_code VALUES ('South Africa','ZA');
+INSERT INTO country_code VALUES ('South Georgia and the South Sandwich Islands','GS');
+INSERT INTO country_code VALUES ('Spain','ES');
+INSERT INTO country_code VALUES ('Sri Lanka','LK');
+INSERT INTO country_code VALUES ('Sudan','SD');
+INSERT INTO country_code VALUES ('Suriname','SR');
+INSERT INTO country_code VALUES ('South Sudan','SS');
+INSERT INTO country_code VALUES ('Svalbard and Jan Mayen','SJ');
+INSERT INTO country_code VALUES ('Swaziland','SZ');
+INSERT INTO country_code VALUES ('Sweden','SE');
+INSERT INTO country_code VALUES ('Switzerland','CH');
+INSERT INTO country_code VALUES ('Syrian Arab Republic','SY');
+INSERT INTO country_code VALUES ('Taiwan','TW');
+INSERT INTO country_code VALUES ('Tajikistan','TJ');
+INSERT INTO country_code VALUES ('Tanzania, United Republic of','TZ');
+INSERT INTO country_code VALUES ('Thailand','TH');
+INSERT INTO country_code VALUES ('Timor-Leste','TL');
+INSERT INTO country_code VALUES ('Togo','TG');
+INSERT INTO country_code VALUES ('Tokelau','TK');
+INSERT INTO country_code VALUES ('Tonga','TO');
+INSERT INTO country_code VALUES ('Trinidad and Tobago','TT');
+INSERT INTO country_code VALUES ('Tunisia','TN');
+INSERT INTO country_code VALUES ('Turkey','TR');
+INSERT INTO country_code VALUES ('Turkmenistan','TM');
+INSERT INTO country_code VALUES ('Turks and Caicos Islands','TC');
+INSERT INTO country_code VALUES ('Tuvalu','TV');
+INSERT INTO country_code VALUES ('Uganda','UG');
+INSERT INTO country_code VALUES ('Ukraine','UA');
+INSERT INTO country_code VALUES ('United Arab Emirates','AE');
+INSERT INTO country_code VALUES ('United Kingdom','GB');
+INSERT INTO country_code VALUES ('United States','US');
+INSERT INTO country_code VALUES ('United States Minor Outlying Islands','UM');
+INSERT INTO country_code VALUES ('Uruguay','UY');
+INSERT INTO country_code VALUES ('Uzbekistan','UZ');
+INSERT INTO country_code VALUES ('Vanuatu','VU');
+INSERT INTO country_code VALUES ('Venezuela','VE');
+INSERT INTO country_code VALUES ('Viet Nam','VN');
+INSERT INTO country_code VALUES ('Virgin Islands, British','VG');
+INSERT INTO country_code VALUES ('Virgin Islands, U.S.','VI');
+INSERT INTO country_code VALUES ('Wallis and Futuna','WF');
+INSERT INTO country_code VALUES ('Western Sahara','EH');
+INSERT INTO country_code VALUES ('Yemen','YE');
+INSERT INTO country_code VALUES ('Zambia','ZM');
+INSERT INTO country_code VALUES ('Zimbabwe','ZW');

Modified: trunk/src/debian/changelog
===================================================================
--- trunk/src/debian/changelog	2012-05-23 13:08:22 UTC (rev 15558)
+++ trunk/src/debian/changelog	2012-05-23 13:21:33 UTC (rev 15559)
@@ -4,11 +4,15 @@
 
  -- Roland Mas <lolando at debian.org>  Mon, 26 Mar 2012 20:10:13 +0200
 
-fusionforge (5.1.50+svn15410-2) UNRELEASED; urgency=low
+fusionforge (5.1.50+svn15558-1) experimental; urgency=low
 
-  * 
+  * New upstream SVN snapshot from the 5.2 stabilisation branch.
+  * Generate initial list of countries and codes from the current known
+    data (from isoquery) at build time (closes: #565240).  Thanks to David
+    Prévot <david at tilapin.org> for the bulk of the patch.
+  * Remove UCF-generated files on purge (closes: #672256).
 
- -- Roland Mas <lolando at debian.org>  Fri, 27 Apr 2012 16:15:09 +0200
+ -- Roland Mas <lolando at debian.org>  Wed, 23 May 2012 14:34:18 +0200
 
 fusionforge (5.1.50+svn15410-1) experimental; urgency=low
 
@@ -32,6 +36,14 @@
 
  -- Roland Mas <lolando at debian.org>  Tue, 27 Mar 2012 20:57:28 +0200
 
+fusionforge (5.1.1-7) unstable; urgency=low
+
+  * Many fixes from the 5.1 upstream branch.
+  * Set up a dpkg trigger to handle Mediawiki upgrades and update the
+    database schemas accordingly (closes: #673125).
+
+ -- Roland Mas <lolando at debian.org>  Wed, 23 May 2012 13:54:10 +0200
+
 fusionforge (5.1.1-6) unstable; urgency=low
 
   * Fixes in search.

Modified: trunk/src/debian/control
===================================================================
--- trunk/src/debian/control	2012-05-23 13:08:22 UTC (rev 15558)
+++ trunk/src/debian/control	2012-05-23 13:21:33 UTC (rev 15559)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Roland Mas <lolando at debian.org>
 Uploaders: Christian Bayle <bayle at debian.org>, Olivier Berger <obergix at debian.org>
-Build-Depends-Indep: sharutils, docbook-to-man, devscripts, gettext
+Build-Depends-Indep: sharutils, docbook-to-man, devscripts, gettext, isoquery, iso-codes
 Build-Depends: debhelper (>= 7), quilt (>= 0.40), perl, confget
 Standards-Version: 3.9.2
 Homepage: http://fusionforge.org/

Modified: trunk/src/debian/dsf-in/db-postgresql.postinst.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/db-postgresql.postinst.dsfh-in	2012-05-23 13:08:22 UTC (rev 15558)
+++ trunk/src/debian/dsf-in/db-postgresql.postinst.dsfh-in	2012-05-23 13:21:33 UTC (rev 15559)
@@ -70,7 +70,7 @@
 	    ucf --debconf-ok ${pg_hba_dir}/pg_hba.conf. at OLDPACKAGE@-new ${pg_hba_dir}/pg_hba.conf
 	fi
 	# register it with ucfr/ucfq so that next time the normal ucf template is used, in case of user changes (or another package's)
-	ucfr @OLDPACKAGE at -db-postgresql /etc/postgresql/9.0/main/pg_hba.conf
+	ucfr @OLDPACKAGE at -db-postgresql ${pg_hba_dir}/pg_hba.conf
 	rm ${pg_hba_dir}/pg_hba.conf. at OLDPACKAGE@-new
 
 	# Make sure the database accepts connections from these new users

Copied: trunk/src/debian/dsf-in/db-postgresql.postrm (from rev 15558, branches/Branch_5_2/src/debian/dsf-in/db-postgresql.postrm)
===================================================================
--- trunk/src/debian/dsf-in/db-postgresql.postrm	                        (rev 0)
+++ trunk/src/debian/dsf-in/db-postgresql.postrm	2012-05-23 13:21:33 UTC (rev 15559)
@@ -0,0 +1,39 @@
+#! /bin/bash
+# postrm script for @OLDPACKAGE@
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge)
+	for i in $(ucfq -w @OLDPACKAGE at -db-postgresql|cut -d: -f1|grep pg_hba.conf) ; do
+	    ucf --purge $i
+	    ucfr --purge @OLDPACKAGE at -db-postgresql $i
+	done
+	;;
+    
+    remove)
+	;;
+    
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 0
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+exit 0

Modified: trunk/src/debian/dsf-in/db-postgresql.prerm
===================================================================
--- trunk/src/debian/dsf-in/db-postgresql.prerm	2012-05-23 13:08:22 UTC (rev 15558)
+++ trunk/src/debian/dsf-in/db-postgresql.prerm	2012-05-23 13:21:33 UTC (rev 15559)
@@ -52,8 +52,6 @@
 	/usr/share/@OLDPACKAGE@/bin/install-db.sh purge-files
 	ucf --debconf-ok ${pg_hba_dir}/pg_hba.conf. at OLDPACKAGE@-new ${pg_hba_dir}/pg_hba.conf
 	rm ${pg_hba_dir}/pg_hba.conf. at OLDPACKAGE@-new
-	ucf --purge ${pg_hba_dir}/pg_hba.conf
-	ucfr --purge @OLDPACKAGE at -db-postgresql ${pg_hba_dir}/pg_hba.conf
 
 	pg_name=postgresql-$pg_version
 	# Trying "postgresql" init script...

Modified: trunk/src/debian/rules
===================================================================
--- trunk/src/debian/rules	2012-05-23 13:08:22 UTC (rev 15558)
+++ trunk/src/debian/rules	2012-05-23 13:21:33 UTC (rev 15559)
@@ -47,6 +47,8 @@
 INSTALLFILES=$(patsubst packaging/install/%,debian/$(OLDPACKAGE)-%.install,$(wildcard packaging/install/[a-z]*))
 PINSTALLFILES=$(foreach i,$(ENABLED_PLUGINS),$(if $(wildcard plugins/$i/packaging/install/[a-z]*),debian/$(PACKAGE)-plugin-$i.install))
 
+PTRIGGERSFILES=$(foreach i,$(ENABLED_PLUGINS),$(if $(wildcard plugins/$i/debian/[a-z]*.triggers),debian/$(PACKAGE)-plugin-$i.triggers))
+
 DOCSFILES=$(patsubst packaging/docs/%,debian/$(OLDPACKAGE)-%.docs,$(wildcard packaging/docs/[a-z]*)) \
 		$(patsubst packaging/docs/%,debian/$(PACKAGE)-%.docs,$(wildcard packaging/docs/[a-z]*))
 PDOCSFILES=$(foreach i,$(ENABLED_PLUGINS),$(if $(wildcard plugins/$i/packaging/docs/[a-z]*),debian/$(PACKAGE)-plugin-$i.docs))
@@ -82,17 +84,21 @@
 	sh $(CURDIR)/deb-specific/manage-uufiles.sh clean
 
 .PHONY: conffiles
-conffiles: $(PPOSTINST) $(PPRERM) $(CRONDFILES) $(DIRSFILES) $(LINKSFILES) $(INSTALLFILES) $(DOCSFILES) $(READMEFILES) $(PCRONDFILES) $(PDIRSFILES) $(PLINKSFILES) $(PINSTALLFILES) $(PDOCSFILES) $(PEXAMPLESFILES) debian/control
+conffiles: $(PPOSTINST) $(PPRERM) $(CRONDFILES) $(DIRSFILES) $(LINKSFILES) $(INSTALLFILES) $(DOCSFILES) $(READMEFILES) $(PCRONDFILES) $(PDIRSFILES) $(PLINKSFILES) $(PINSTALLFILES) $(PDOCSFILES) $(PTRIGGERSFILES) $(PEXAMPLESFILES) debian/control
 
 # Construct the plugin's 'postinst' script out of a template in debian/dsf-in/plugin.postinst
 debian/$(PACKAGE)-plugin-%.postinst:
 	export PLUGLONGNAME="`cat $(CURDIR)/plugins/$*/NAME`"; \
-		$(SED_REPLACE) -e 's/@PLUGSHORTNAME@/$*/g' -e "s/@PLUGLONGNAME@/$$PLUGLONGNAME/g" $(CURDIR)/debian/dsf-in/plugin.postinst > $@
+		[ -e $(CURDIR)/plugins/$*/debian/plugin-$*.postinst ] \
+		&& $(SED_REPLACE) -e 's/@PLUGSHORTNAME@/$*/g' -e "s/@PLUGLONGNAME@/$$PLUGLONGNAME/g" $(CURDIR)/plugins/$*/debian/plugin-$*.postinst > $@ \
+		|| $(SED_REPLACE) -e 's/@PLUGSHORTNAME@/$*/g' -e "s/@PLUGLONGNAME@/$$PLUGLONGNAME/g" $(CURDIR)/debian/dsf-in/plugin.postinst > $@
 
 # Construct the plugin's 'prerm' script out of a template in debian/dsf-in/plugin.prerm
 debian/$(PACKAGE)-plugin-%.prerm:
 	export PLUGLONGNAME="`cat $(CURDIR)/plugins/$*/NAME`"; \
-		$(SED_REPLACE) -e 's/@PLUGSHORTNAME@/$*/g' -e "s/@PLUGLONGNAME@/$$PLUGLONGNAME/g" $(CURDIR)/debian/dsf-in/plugin.prerm > $@
+		[ -e $(CURDIR)/plugins/$*/debian/plugin-$*.prerm ] \
+		&& $(SED_REPLACE) -e 's/@PLUGSHORTNAME@/$*/g' -e "s/@PLUGLONGNAME@/$$PLUGLONGNAME/g" $(CURDIR)/plugins/$*/debian/plugin-$*.prerm > $@ \
+		|| $(SED_REPLACE) -e 's/@PLUGSHORTNAME@/$*/g' -e "s/@PLUGLONGNAME@/$$PLUGLONGNAME/g" $(CURDIR)/debian/dsf-in/plugin.prerm > $@
 
 # Perform substitutions in plugin's cron.d file
 debian/$(PACKAGE)-plugin-%.cron.d:
@@ -102,7 +108,7 @@
 debian/$(OLDPACKAGE)-%.cron.d:
 	(cat $(CURDIR)/packaging/cron.d/00phpcron ; $(SED_REPLACE) -e 's/\$$FFUSER/$(OLDPACKAGE)/g' $(CURDIR)/packaging/cron.d/$*) | $(SED_REPLACE) > $@
 
-# Perform subsitutions on 'dirs', 'links', 'install', 'docs' files
+# Perform subsitutions on 'dirs', 'links', 'install', 'docs', 'triggers' files
 debian/$(PACKAGE)-plugin-%.dirs:
 	$(SED_REPLACE) $(CURDIR)/plugins/$*/packaging/dirs/plugin-$* > $@
 
@@ -118,6 +124,9 @@
 debian/$(PACKAGE)-plugin-%.install:
 	$(SED_REPLACE) $(CURDIR)/plugins/$*/packaging/install/plugin-$* > $@
 
+debian/$(PACKAGE)-plugin-%.triggers:
+	$(SED_REPLACE) $(CURDIR)/plugins/$*/debian/plugin-$*.triggers > $@
+
 debian/$(OLDPACKAGE)-%.install:
 	$(SED_REPLACE) $(CURDIR)/packaging/install/$* > $@ 
 
@@ -193,6 +202,9 @@
 #       Build FHS-compatible Apache config files (generates contents of etc/httpd.conf.d-fhs/ etc.)
 	utils/manage-apache-config.sh build
 
+#	Update SQL for list of country codes
+	utils/ffcountries.pl > 200403251.sql
+
 # 	Preprocess files with DSF-Helper
 	perl $(CURDIR)/deb-specific/dsf-helper.pl
 
@@ -208,7 +220,7 @@
 	rm -f $(CURDIR)/debian/*.README.Debian
 	rm -f $(CURDIR)/debian/$(PACKAGE)-config.sgml
 	rm -f $(CURDIR)/debian/$(OLDPACKAGE)-common.manpages
-	rm -f cvssh.1 $(PACKAGE)-config.1
+	rm -f cvssh.1 $(PACKAGE)-config.1 200403251.sql
 	rm -f $(CURDIR)/debian/README.Debian
 	rm -rf locales
 

Modified: trunk/src/packaging/control/000source
===================================================================
--- trunk/src/packaging/control/000source	2012-05-23 13:08:22 UTC (rev 15558)
+++ trunk/src/packaging/control/000source	2012-05-23 13:21:33 UTC (rev 15559)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Roland Mas <lolando at debian.org>
 Uploaders: Christian Bayle <bayle at debian.org>, Olivier Berger <obergix at debian.org>
-Build-Depends-Indep: sharutils, docbook-to-man, devscripts, gettext
+Build-Depends-Indep: sharutils, docbook-to-man, devscripts, gettext, isoquery, iso-codes
 Build-Depends: debhelper (>= 7), quilt (>= 0.40), perl, confget
 Standards-Version: 3.9.2
 Homepage: http://fusionforge.org/

Modified: trunk/src/packaging/install/common
===================================================================
--- trunk/src/packaging/install/common	2012-05-23 13:08:22 UTC (rev 15558)
+++ trunk/src/packaging/install/common	2012-05-23 13:21:33 UTC (rev 15559)
@@ -29,3 +29,4 @@
 plugins/authbuiltin/etc/*.ini 	    etc/@PACKAGE@/config.ini.d/
 #
 utils/list-admins.php                  usr/share/@OLDPACKAGE@/bin/
+utils/list-projects-using-plugin.php   usr/share/@OLDPACKAGE@/bin/

Modified: trunk/src/packaging/install/db-postgresql
===================================================================
--- trunk/src/packaging/install/db-postgresql	2012-05-23 13:08:22 UTC (rev 15558)
+++ trunk/src/packaging/install/db-postgresql	2012-05-23 13:21:33 UTC (rev 15559)
@@ -45,6 +45,7 @@
 db/2003*.sql                            usr/share/@OLDPACKAGE@/db/
 db/2004*php                             usr/share/@OLDPACKAGE@/db/
 db/2004*.sql                            usr/share/@OLDPACKAGE@/db/
+200403251.sql				usr/share/@OLDPACKAGE@/db/
 db/2005*php                             usr/share/@OLDPACKAGE@/db/
 db/2005*.sql                            usr/share/@OLDPACKAGE@/db/
 db/2006*.sql                            usr/share/@OLDPACKAGE@/db/

Copied: trunk/src/utils/ffcountries.pl (from rev 15558, branches/Branch_5_2/src/utils/ffcountries.pl)
===================================================================
--- trunk/src/utils/ffcountries.pl	                        (rev 0)
+++ trunk/src/utils/ffcountries.pl	2012-05-23 13:21:33 UTC (rev 15559)
@@ -0,0 +1,26 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+print "ALTER TABLE users ADD COLUMN firstname varchar(60);
+ALTER TABLE users ADD COLUMN lastname varchar(60);
+ALTER TABLE users ADD COLUMN address2 text;
+ALTER TABLE users ADD COLUMN ccode char(2);
+ALTER TABLE users ALTER COLUMN ccode SET DEFAULT 'US';
+UPDATE USERS SET ccode='US',firstname=realname WHERE firstname is null;
+
+CREATE TABLE country_code (
+	country_name varchar(80),
+	ccode char(2) primary key
+);
+
+";
+
+foreach (`isoquery -c`) {
+	chomp ;
+	my $cc = substr($_,0,2);
+	$_ =~ s/.*\t//;
+	$_ =~ s/'/''/g;
+	print "INSERT INTO country_code VALUES ('$_','$cc');\n";
+}


Property changes on: trunk/src/utils/ffcountries.pl
___________________________________________________________________
Added: svn:executable
   + *

Copied: trunk/src/utils/list-projects-using-plugin.php (from rev 15558, branches/Branch_5_2/src/utils/list-projects-using-plugin.php)
===================================================================
--- trunk/src/utils/list-projects-using-plugin.php	                        (rev 0)
+++ trunk/src/utils/list-projects-using-plugin.php	2012-05-23 13:21:33 UTC (rev 15559)
@@ -0,0 +1,53 @@
+#! /usr/bin/php -f
+<?php
+/**
+ * FusionForge
+ *
+ * Copyright 2012, Roland Mas
+ *
+ * This file is part of FusionForge.
+ *
+ * FusionForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+if (count ($argv) < 2) {
+        echo "Usage: .../list-projects-using-plugin.php <plugin>
+For instance: .../list-projects-using-plugin.php mediawiki
+" ;
+        exit (1) ;
+}
+
+$pname = $argv[1] ;
+
+require (dirname(__FILE__).'/../common/include/env.inc.php');
+require_once $gfcommon.'include/pre.php';
+require_once $gfcommon.'include/cron_utils.php';
+
+// Plugins subsystem
+require_once($gfcommon.'include/Plugin.class.php');
+require_once($gfcommon.'include/PluginManager.class.php');
+
+setup_plugin_manager () ;
+
+$plugin = plugin_get_object($pname);
+
+if (!$plugin) {
+	die ("Wrong plugin name\n") ;
+}
+
+foreach ($plugin->getGroups() as $p) {
+	print $p->getUnixName()."\n";
+}
+?>

Modified: trunk/tests/AllFullTests.php
===================================================================
--- trunk/tests/AllFullTests.php	2012-05-23 13:08:22 UTC (rev 15558)
+++ trunk/tests/AllFullTests.php	2012-05-23 13:21:33 UTC (rev 15559)
@@ -3,8 +3,10 @@
 	define('PHPUnit_MAIN_METHOD', 'AllTests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+if (!@include_once 'PHPUnit/Autoload.php') {
+	include_once 'PHPUnit/Framework.php';
+	require_once 'PHPUnit/TextUI/TestRunner.php';
+}
 
 class AllTests
 {

Modified: trunk/tests/AllTests.php
===================================================================
--- trunk/tests/AllTests.php	2012-05-23 13:08:22 UTC (rev 15558)
+++ trunk/tests/AllTests.php	2012-05-23 13:21:33 UTC (rev 15559)
@@ -3,8 +3,10 @@
 	define('PHPUnit_MAIN_METHOD', 'AllTests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+if (!@include_once 'PHPUnit/Autoload.php') {
+	include_once 'PHPUnit/Framework.php';
+	require_once 'PHPUnit/TextUI/TestRunner.php';
+}
 
 class AllTests
 {

Modified: trunk/tests/DEBDebian60Tests.php
===================================================================
--- trunk/tests/DEBDebian60Tests.php	2012-05-23 13:08:22 UTC (rev 15558)
+++ trunk/tests/DEBDebian60Tests.php	2012-05-23 13:21:33 UTC (rev 15559)
@@ -3,8 +3,11 @@
 	define('PHPUnit_MAIN_METHOD', 'AllTests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+if (!@include_once 'PHPUnit/Autoload.php') {
+	include_once 'PHPUnit/Framework.php';
+	require_once 'PHPUnit/TextUI/TestRunner.php';
+}
+
 require_once 'func/Testing/DEBSeleniumRemoteSuite.php';
 
 class DEBDebian60Tests

Modified: trunk/tests/SeleniumTests.php
===================================================================
--- trunk/tests/SeleniumTests.php	2012-05-23 13:08:22 UTC (rev 15558)
+++ trunk/tests/SeleniumTests.php	2012-05-23 13:21:33 UTC (rev 15559)
@@ -3,8 +3,10 @@
 	define('PHPUnit_MAIN_METHOD', 'AllTests::main');
 }
 
-include_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+if (!@include_once 'PHPUnit/Autoload.php') {
+	include_once 'PHPUnit/Framework.php';
+	require_once 'PHPUnit/TextUI/TestRunner.php';
+}
 
 class AllTests
 {

Modified: trunk/tests/func/AllTests.php
===================================================================
--- trunk/tests/func/AllTests.php	2012-05-23 13:08:22 UTC (rev 15558)
+++ trunk/tests/func/AllTests.php	2012-05-23 13:21:33 UTC (rev 15559)
@@ -3,8 +3,10 @@
 	define('PHPUnit_MAIN_METHOD', 'AllTests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+if (!@include_once 'PHPUnit/Autoload.php') {
+	include_once 'PHPUnit/Framework.php';
+	require_once 'PHPUnit/TextUI/TestRunner.php';
+}
 
 // Unit tests
 //require_once 'ACL/AllTests.php';

Modified: trunk/tests/func/Soap/AllTests.php
===================================================================
--- trunk/tests/func/Soap/AllTests.php	2012-05-23 13:08:22 UTC (rev 15558)
+++ trunk/tests/func/Soap/AllTests.php	2012-05-23 13:21:33 UTC (rev 15559)
@@ -47,9 +47,11 @@
     define('PHPUnit_MAIN_METHOD', 'Site_AllTests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
+if (!@include_once 'PHPUnit/Autoload.php') {
+	include_once 'PHPUnit/Framework.php';
+	require_once 'PHPUnit/TextUI/TestRunner.php';
+}
+ 
 require_once 'func/config.php';
 require_once 'func/Soap/checks.php';
 require_once 'func/Soap/login.php';




More information about the Fusionforge-commits mailing list