Timestamp:
05/24/10 17:45:38 (3 years ago)
Author:
plg
Message:

merge r6271 from trunk to branch 2.1

Location:
branches/2.1
Files:
4 modified

  • branches/2.1

    • Property svn:mergeinfo

      •  

        old new  
        11/branches/2.0:4963,4965*,5001*,5013* 
        2 /trunk:6240*,6265-6268*,6320* 
         2/trunk:6240*,6265-6268*,6271*,6320* 

  • branches/2.1/language

    • Property svn:mergeinfo

      •  

        old new  
        11/branches/2.0/language:4963 
        2 /trunk/language:6240*,6266-6268* 
         2/trunk/language:6240*,6266-6268*,6271* 

  • branches/2.1/language/it_IT

    • Property svn:mergeinfo

      •  

        old new  
        11/branches/2.0/language/it_IT:4963 
        2 /trunk/language/it_IT:6266-6268* 
         2/trunk/language/it_IT:6266-6268*,6271* 

  • branches/2.1/language/it_IT/install.lang.php

    • Property svn:mergeinfo changed (with no actual effect on merging)