From abe511fd6c23b3bfae62c9893d4ca596ba1e59c1 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 4 Apr 2008 22:45:34 +0000
Subject: [PATCH] Blocked revisions 45976,45979-45981,45983 via svnmerge

................
  r45976 | ischommer | 2007-11-29 17:35:04 +1300 (Thu, 29 Nov 2007) | 3 lines

  Initialized merge tracking via "svnmerge" with revisions "1-45519" from
  svn://svn.silverstripe.com/open/modules/sapphire/trunk
................
  r45979 | ischommer | 2007-11-29 17:37:35 +1300 (Thu, 29 Nov 2007) | 3 lines

  Removed merge tracking for "svnmerge" for
  svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk
................
  r45980 | ischommer | 2007-11-29 17:39:16 +1300 (Thu, 29 Nov 2007) | 1 line

  removed svnmerge
................
  r45981 | ischommer | 2007-11-29 17:41:04 +1300 (Thu, 29 Nov 2007) | 3 lines

  Initialized merge tracking via "svnmerge" with revisions "1-45691" from
  svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1
................
  r45983 | ischommer | 2007-11-29 17:42:38 +1300 (Thu, 29 Nov 2007) | 29 lines

  Merged revisions 45762-45962 via svnmerge from
  svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

  ........
    r45762 | aoneil | 2007-11-27 18:10:18 +1300 (Tue, 27 Nov 2007) | 2 lines

    #1892 - Image attach from file store broken
  ........
    r45823 | jshipman | 2007-11-28 11:41:56 +1300 (Wed, 28 Nov 2007) | 1 line

    Authentication for test wasn't working.
  ........
    r45825 | jshipman | 2007-11-28 11:46:46 +1300 (Wed, 28 Nov 2007) | 1 line

    XML parser improvements
  ........
    r45906 | sminnee | 2007-11-29 10:04:51 +1300 (Thu, 29 Nov 2007) | 1 line

    Removed hashing algorithms that contained a command to allow for mysqldumps to be run without very weird corruption errors
  ........
    r45944 | sminnee | 2007-11-29 15:38:09 +1300 (Thu, 29 Nov 2007) | 1 line

    Moving branches/2.2.0 to branches/2.2.1 in prep for a 'critical bugfix release'
  ........
    r45962 | jshipman | 2007-11-29 16:47:51 +1300 (Thu, 29 Nov 2007) | 1 line

    content controller notice, hyperlink underlining
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52149 467b73ca-7a2a-4603-9d3b-597d59a354a9