Merge branch 'MDL-39536-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 05:18:49 +0000 (13:18 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 05:18:49 +0000 (13:18 +0800)

Trivial merge