Merge branch 'master_MDL-42992' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Nov 2013 03:17:47 +0000 (11:17 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Nov 2013 03:17:47 +0000 (11:17 +0800)

Trivial merge