Merge branch 'MDL-47518' of https://github.com/rlorenzo/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Oct 2014 13:32:48 +0000 (14:32 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Oct 2014 13:32:48 +0000 (14:32 +0100)

Trivial merge