Merge branch 'w12_MDL-32079_m23_folderrev' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 22:34:21 +0000 (11:34 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 22:34:21 +0000 (11:34 +1300)

Trivial merge