Merge branch 'MDL-45961' of https://github.com/NeillM/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Jul 2014 17:13:43 +0000 (19:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Jul 2014 17:13:43 +0000 (19:13 +0200)

Trivial merge