Merge branch 'w28_MDL-34175_m23_admin' of git://github.com/skodak/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Wed, 11 Jul 2012 06:51:07 +0000 (14:51 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 11 Jul 2012 06:51:07 +0000 (14:51 +0800)

Trivial merge