Merge branch 'w28_MDL-34175_m23_admin' of git://github.com/skodak/moodle into MOODLE_...
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Jul 2012 00:43:42 +0000 (12:43 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Jul 2012 00:43:42 +0000 (12:43 +1200)

Trivial merge