Merge branch 'MDL-34737-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jun 2014 09:53:33 +0000 (11:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jun 2014 09:53:33 +0000 (11:53 +0200)

Trivial merge