Merge branch 'MDL-33088-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 6 Jun 2012 05:20:59 +0000 (13:20 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 6 Jun 2012 05:20:59 +0000 (13:20 +0800)

Trivial merge