Merge branch 'MDL-28420_master' of https://github.com/jrchamp/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Jun 2014 00:07:34 +0000 (02:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Jun 2014 00:07:34 +0000 (02:07 +0200)

Trivial merge