Merge branch 'MDL-41798' of git://github.com/rwijaya/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 22:26:20 +0000 (00:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 22:26:20 +0000 (00:26 +0200)

Trivial merge