Merge branch 'MDL-38661-m-i' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Sep 2013 15:09:25 +0000 (17:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Sep 2013 15:09:25 +0000 (17:09 +0200)

Trivial merge