Merge branch 'w12_MDL-31703_m23_rootdirroot' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 07:16:34 +0000 (20:16 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 07:16:34 +0000 (20:16 +1300)

Trivial merge