Merge branch 'MDL-47140-master' of git://github.com/gurgus/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Oct 2014 08:54:02 +0000 (09:54 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Oct 2014 08:54:02 +0000 (09:54 +0100)

Trivial merge