Merge branch 's11_MDL-27976_undefined_variable_master' of github.com:dongsheng/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 1 Jul 2011 11:43:05 +0000 (13:43 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 1 Jul 2011 11:43:05 +0000 (13:43 +0200)

Trivial merge