Merge branch 'MDL-36942_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 02:04:17 +0000 (15:04 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 02:04:17 +0000 (15:04 +1300)
commit2e6538382a5c11615aa068990b4373c2f85ad59d
treec27d5b903c44a7127c9e51a10bc47a4ce09d8a38
parentb74804c8a80704819880a27da7d65ca848fcf69d
parenta0a83bd0bf44f851aec25833efacf7412799f9f9
Merge branch 'MDL-36942_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE