Merge branch 'w37_MDL-28094_m26_subdirs' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 8 Sep 2013 22:19:00 +0000 (10:19 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 8 Sep 2013 22:19:00 +0000 (10:19 +1200)

Trivial merge