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

Trivial merge