Merge branch 'MDL-34899b' of git://github.com/srynot4sale/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Aug 2012 20:24:20 +0000 (22:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Aug 2012 20:24:20 +0000 (22:24 +0200)

Trivial merge