Merge branch 'MDL-28248b' of https://github.com/totara/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Aug 2011 01:39:23 +0000 (03:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Aug 2011 01:39:23 +0000 (03:39 +0200)

Trivial merge