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

Trivial merge