Merge branch 'MDL-34745' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Aug 2012 23:22:49 +0000 (01:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Aug 2012 23:22:49 +0000 (01:22 +0200)

Trivial merge