Merge branch 'MDL-43236_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Mar 2014 04:04:14 +0000 (12:04 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Mar 2014 04:04:14 +0000 (12:04 +0800)

Trivial merge