Merge branch 'MDL-42538_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 03:35:54 +0000 (11:35 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 03:35:54 +0000 (11:35 +0800)

Trivial merge