Merge branch 'MDL-33397-master' of https://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 31 May 2012 02:35:50 +0000 (10:35 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 31 May 2012 02:35:50 +0000 (10:35 +0800)

Trivial merge