Merge branch 'MDL-33724' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2012 00:56:19 +0000 (02:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2012 00:56:19 +0000 (02:56 +0200)

Trivial merge