Merge branch 'MDL-33389_master' of git://github.com/kordan/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 31 May 2012 14:14:57 +0000 (16:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 31 May 2012 14:14:57 +0000 (16:14 +0200)

Trivial merge