Merge branch 'mdl34368' of https://bitbucket.org/ngmares/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jul 2012 07:49:12 +0000 (15:49 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jul 2012 07:49:12 +0000 (15:49 +0800)

Trivial merge