Merge branch 'w49_MDL-36731_m23_uploadestrict' of git://github.com/skodak/moodle...
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 03:04:13 +0000 (16:04 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 03:04:13 +0000 (16:04 +1300)
commitb54470f497323a553b3af4fcfcc124f204d84d90
tree9e864c99a59af1551c4464fadfc4fd511b87ee8d
parent237ea8768c92a70cfb3420371657b09a85244180
parentee152c01047b3ec4b2ac3808629a10956a7fd5dd
Merge branch 'w49_MDL-36731_m23_uploadestrict' of git://github.com/skodak/moodle into MOODLE_23_STABLE