Merge branch 'm23_MDL-34374' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Sun, 22 Jul 2012 23:38:09 +0000 (11:38 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 22 Jul 2012 23:38:09 +0000 (11:38 +1200)
commitf315e3e184a3cabef6a3b7bc28b6d040769fed34
treed896298dbcfa2e4f014d4160f63bd2490ef5e2a8
parent93c3b29893f8c4d432d9f1501ebd06c680a2c99e
parentfece4fd6482afb6499481200f884ca74f319820f
Merge branch 'm23_MDL-34374' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE