Merge branch 'MDL-34841' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2012 23:15:14 +0000 (01:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2012 23:15:14 +0000 (01:15 +0200)

Trivial merge