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

Trivial merge