Merge branch 'w36_MDL-34097_m22_environment' of git://github.com/skodak/moodle into...
commit91f65d0ab4142b62474eebe0f13377b125c5ed14
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 22:02:01 +0000 (4 00:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 22:02:01 +0000 (4 00:02 +0200)
tree7c7fe86e737fe6addf002465d8bd3b95017dc942
parent7b3a9020e62145305c74518e4f52a16955dad2ae
parentcbff07faefa135958f7a66f7436f3b7b04a14ff1
Merge branch 'w36_MDL-34097_m22_environment' of git://github.com/skodak/moodle into MOODLE_22_STABLE