Merge branch 'MDL-29924-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 03:14:22 +0000 (11:14 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 03:14:22 +0000 (11:14 +0800)

Trivial merge