Merge branch 'MDL-28444' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 20:46:17 +0000 (22:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 20:46:17 +0000 (22:46 +0200)

Trivial merge