Merge branch 'w33_MDL-28708_m22_f304' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 21:26:06 +0000 (23:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 21:26:06 +0000 (23:26 +0200)

Trivial merge