Merge branch 'MDL-42408_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Oct 2013 03:15:21 +0000 (11:15 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Oct 2013 03:15:21 +0000 (11:15 +0800)

Trivial merge