Partially merge w07_MDL-25575_20_contexttrouble. See PULL-299
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 16:54:42 +0000 (17:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 16:58:21 +0000 (17:58 +0100)

Trivial merge