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

Trivial merge