Merge branch 'MDL-35870' of git://github.com/nobelium/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 23:06:53 +0000 (01:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 23:06:53 +0000 (01:06 +0200)

Trivial merge