Merge branch 'w02_MDL-43537_m27_env' of https://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jan 2014 15:01:27 +0000 (16:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jan 2014 15:01:27 +0000 (16:01 +0100)

Trivial merge