Author: jkocherhans Date: 2010-02-23 09:27:36 -0600 (Tue, 23 Feb 2010) New Revision: 12531
Modified: django/branches/releases/1.1.X/ Log: [1.1.X] Blocked a couple of revisions that shouldn't be merged. Property changes on: django/branches/releases/1.1.X ___________________________________________________________________ Name: svnmerge-blocked - /django/trunk:11526,11586-11587,11590,11593-11595,11600,11618,11627,11636,11639-11642,11645-11647,11654-11655,11660-11661,11663-11669,11672-11673,11675-11677,11680,11683,11709-11713,11716-11718,11721-11731,11736-11739,11742-11747,11752,11755,11778-11799,11803-11807,11810,11814,11830,11843,11846-11848,11850,11854-11855,11858,11861-11863,11880,11883-11884,11887,11900,11907,11910,11915,11916,11921,11923-11924,11937,11943,11952,11955-11956,11959-11960,11964-11976,11981-11983,12008-12010,12013,12021,12026-12037,12041-12043,12046-12047,12049-12053,12057-12058,12060,12080-12085,12089,12097-12103,12106-12117,12120,12122-12125,12127,12135,12139,12142,12146,12148,12153-12157,12159-12160,12164,12174,12176-12177,12180,12185,12191-12192,12194-12196,12198,12203-12219,12222-12228,12232,12247-12248,12255-12262,12264-12275,12278-12281,12285,12287-12292,12295-12312,12315-12316,12335-12338,12345,12349-12352,12354,12357-12361,12364-12378,12381-12383,12386-12397,12399-12403 + /django/trunk:11526,11586-11587,11590,11593-11595,11600,11618,11627,11636,11639-11642,11645-11647,11654-11655,11660-11661,11663-11669,11672-11673,11675-11677,11680,11683,11709-11713,11716-11718,11721-11731,11736-11739,11742-11747,11752,11755,11778-11799,11803-11807,11810,11814,11830,11843,11846-11848,11850,11854-11855,11858,11861-11863,11880,11883-11884,11887,11900,11907,11910,11915-11916,11921,11923-11924,11937,11943,11952,11955-11956,11959-11960,11964-11976,11981-11983,12008-12010,12013,12021,12026-12037,12041-12043,12046-12047,12049-12053,12057-12058,12060,12080-12085,12089,12097-12103,12106-12117,12120,12122-12125,12127,12135,12139,12142,12146,12148,12153-12157,12159-12160,12164,12174,12176-12177,12180,12185,12191-12192,12194-12196,12198,12203-12219,12222-12228,12232,12247-12248,12255-12262,12264-12275,12278-12281,12285,12287-12292,12295-12312,12315-12316,12335-12338,12345,12349-12352,12354,12357-12361,12364-12378,12381-12383,12386-12397,12399-12403,12496,12525 -- You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to django-upda...@googlegroups.com. To unsubscribe from this group, send email to django-updates+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/django-updates?hl=en.
