Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 17:12:20 +0000 (18:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 17:12:20 +0000 (18:12 +0100)

Trivial merge