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)

Trivial merge