Merge branch 'MDL-47294-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 07:47:31 +0000 (08:47 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 07:47:31 +0000 (08:47 +0100)

Trivial merge