Merge branch 'MDL-33775-master-integration' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 07:18:02 +0000 (15:18 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 07:18:02 +0000 (15:18 +0800)

Trivial merge