Merge branch 'MDL-44478-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Mar 2014 09:53:49 +0000 (17:53 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Mar 2014 17:32:49 +0000 (18:32 +0100)

Trivial merge