Merge branch 'MDL-40013_master' of git://github.com/oasychev/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 06:57:48 +0000 (14:57 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 06:57:48 +0000 (14:57 +0800)

Trivial merge