Timestamp:
05/24/10 17:34:29 (3 years ago)
Author:
plg
Message:

merge r6266 from trunk to branch 2.1

Location:
branches/2.1
Files:
2 modified

  • branches/2.1

    • Property svn:mergeinfo

      •  

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

  • branches/2.1/picture.php

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