Merge branch 'MDL-36978_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:21:08 +0000 (14:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:21:08 +0000 (14:21 +1300)
commitb35e30e5bcc939e966b92df13402852de6d13df4
treed1cc6b6a96e748a453559a062dfeeb9727c1be0b
parentccca91bd9e1b5ac20d7196ba0393135120ba0f67
parentbf5886726f5f528dde9c1a9d408a399ee6818fa9
Merge branch 'MDL-36978_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE