Changeset 6329 for branches/2.1/upload.php

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:

• . (modified) (1 prop)
• upload.php (modified) (1 prop)

branches/2.1

@@ -1 +1 @@
 /branches/2.0:4963,4965*,5001*,5013*
-/trunk:6240*,6265*,6320*
+/trunk:6240*,6265-6266*,6320*

@@ -1 +1 @@
 /branches/2.0:4963,4965*,5001*,5013*
-/trunk:6240*,6265*,6320*
+/trunk:6240*,6265-6266*,6320*

@@ -1 +1 @@
 /branches/2.0:4963,4965*,5001*,5013*
-/trunk:6240*,6265*,6320*
+/trunk:6240*,6265-6266*,6320*