Merge branch 'master_MDL-30223' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 00:20:39 +0000 (01:20 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 00:20:39 +0000 (01:20 +0100)

Trivial merge