Merge branch 'MDL-42738_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Dec 2013 04:41:03 +0000 (12:41 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Dec 2013 04:41:03 +0000 (12:41 +0800)

Trivial merge