Merge branch 'w36_MDL-34097_m23_environment' of git://github.com/skodak/moodle into...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 22:00:38 +0000 (00:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 22:00:38 +0000 (00:00 +0200)

Trivial merge