Merge branch 'w13_MDL-32095_m23_strict2' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2012 20:49:38 +0000 (22:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2012 20:49:38 +0000 (22:49 +0200)

Trivial merge