Merge branch 'w13_MDL-31685_m23_filelocking' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 Mar 2012 21:35:48 +0000 (10:35 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 Mar 2012 21:35:48 +0000 (10:35 +1300)

Trivial merge