Merge branch 'MDL-38732-master-2nd' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 15 Oct 2014 07:41:23 +0000 (08:41 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 15 Oct 2014 07:41:23 +0000 (08:41 +0100)

Trivial merge