Merge branch 'master_MDL-25757' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 22:37:23 +0000 (00:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 22:37:23 +0000 (00:37 +0200)

Trivial merge