Merge branch 'w12_MDL-32043_m23_webserver' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 23:12:44 +0000 (12:12 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 23:12:44 +0000 (12:12 +1300)

Trivial merge