Merge branch 'MDL-32693' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 May 2012 16:22:05 +0000 (18:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 May 2012 16:22:05 +0000 (18:22 +0200)

Trivial merge