Merge branch 'MDL-32924' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 May 2012 01:13:00 +0000 (03:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 May 2012 01:13:00 +0000 (03:13 +0200)

Trivial merge