Merge branch 'w23_MDL-39465_m23_environment' of git://github.com/skodak/moodle into...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 22:01:24 +0000 (00:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 22:01:24 +0000 (00:01 +0200)

Trivial merge