Merge branch 'MDL-44523_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 16:06:52 +0000 (18:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 16:06:52 +0000 (18:06 +0200)

Trivial merge