Merge branch 'w29_MDL-28337_m22_urlparams' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 02:29:42 +0000 (10:29 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 02:29:42 +0000 (10:29 +0800)

Trivial merge