Merge branch 'w49_MDL-36731_m25_uploadestrict' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 03:04:31 +0000 (16:04 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 03:04:31 +0000 (16:04 +1300)

Trivial merge