Merge branch 'MDL-43717_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 04:19:34 +0000 (12:19 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 04:19:34 +0000 (12:19 +0800)

Trivial merge