Merge branch 'wip-MDL-34012-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 00:57:15 +0000 (02:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 00:57:15 +0000 (02:57 +0200)

Trivial merge