Merge branch 'MDL-47358-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Sep 2014 10:58:14 +0000 (11:58 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Sep 2014 10:58:14 +0000 (11:58 +0100)

Trivial merge