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

Trivial merge