Merge branch 'MDL-39947' of https://github.com/aolley/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 08:19:56 +0000 (16:19 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 08:19:56 +0000 (16:19 +0800)

Trivial merge