Merge branch 'MDL-44929-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jun 2014 09:04:11 +0000 (11:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jun 2014 09:04:11 +0000 (11:04 +0200)

Trivial merge