Merge branch 'MDL-33523_master' of git://github.com/dmiletic/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2012 01:09:30 +0000 (03:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2012 01:09:30 +0000 (03:09 +0200)

Trivial merge