Merge branch 'MDL-41109-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 May 2014 07:07:36 +0000 (15:07 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 19 May 2014 07:07:36 +0000 (15:07 +0800)

Trivial merge