Merge branch 'MDL-47713-master-fix1' of http://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 07:18:31 +0000 (08:18 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 07:18:31 +0000 (08:18 +0100)

Trivial merge