Merge branch 'w42_MDL-29867_m22_author' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 21:14:31 +0000 (23:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 21:14:31 +0000 (23:14 +0200)

Trivial merge