Merge branch 'master_MDL-31366' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 16:13:18 +0000 (18:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 16:13:18 +0000 (18:13 +0200)

Trivial merge