Merge branch 'MDL-34862' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Aug 2012 01:30:56 +0000 (03:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Aug 2012 01:30:56 +0000 (03:30 +0200)

Trivial merge