Merge branch 'MDL-44815-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 1 May 2014 04:06:32 +0000 (12:06 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 1 May 2014 04:06:32 +0000 (12:06 +0800)

Trivial merge