Merge branch 'MDL-37161-moodle24' of https://github.com/StudiUM/moodle into MOODLE_24...
commite04f57c95b31720ebd9a434522caf251ffcf8fa1
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Jan 2013 01:15:17 +0000 (7 14:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Jan 2013 01:15:17 +0000 (7 14:15 +1300)
tree50fe16b4271077ee9be576dd8a2394f64e37e9f4
parentb9639c524d45863cd5ca4d167c677bd9833674cd
parente5d70123c9556a79cd0f19fa36e02b9be00ea9cd
Merge branch 'MDL-37161-moodle24' of https://github.com/StudiUM/moodle into MOODLE_24_STABLE