Merge branch 'wip-MDL-44337-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Mar 2014 07:41:57 +0000 (15:41 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Mar 2014 17:31:49 +0000 (18:31 +0100)

Trivial merge