Merge branch 'MDL-42151_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Oct 2013 08:11:50 +0000 (16:11 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Oct 2013 08:11:50 +0000 (16:11 +0800)

Trivial merge