Merge branch 'w24_MDL-33670_m21_ofadmin' of git://github.com/skodak/moodle into MOODL...
commit417f9d311bc92f5af7a2142b54a9f2f23f09245a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 08:07:15 +0000 (12 10:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 08:07:15 +0000 (12 10:07 +0200)
treeefbf27bca2748ffd22f40260c324b421d82ae0fe
parent9a36598bac36a51f9a75f2b97d64793cd5c5b1c7
parentea1cb30ce7e9ae6bde08b63632080a28c80a2e3c
Merge branch 'w24_MDL-33670_m21_ofadmin' of git://github.com/skodak/moodle into MOODLE_21_STABLE