Merge branch 'MDL-41216' of https://github.com/nobelium/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Mar 2014 00:23:08 +0000 (01:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Mar 2014 00:23:08 +0000 (01:23 +0100)

Trivial merge