Merge branch 'mdl32379_23' of git://github.com/tlevi/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 May 2012 03:29:01 +0000 (11:29 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 May 2012 03:29:01 +0000 (11:29 +0800)

Trivial merge