Merge branch 'MDL-47243-master' of git://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 15 Oct 2014 15:14:39 +0000 (16:14 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 15 Oct 2014 15:14:39 +0000 (16:14 +0100)

Trivial merge