Merge branch 'MDL-45284_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Apr 2014 02:09:18 +0000 (14:09 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Apr 2014 02:09:18 +0000 (14:09 +1200)
commit0e7408683fff84ce6e4bb09454b719dcde31ddc8
treeab4326a37ad9af477d72354781e02b208e139e64
parentcf3166aafbd625494350d96974d646562f748685
parent560fc52dca280b85fe7c935c7f2d5f65237db098
Merge branch 'MDL-45284_master' of git://github.com/dmonllao/moodle