Merge branch 'MDL-30132_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
commit62c4ccef0e025a71d497341de0af9448bd51aa43
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jun 2013 22:26:10 +0000 (18 10:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jun 2013 22:26:10 +0000 (18 10:26 +1200)
tree28346e07a3a62c17bd5d71d5bcdadf936a167e14
parentdf86b97f1ad4c0feb9a4457581b0035c7d71c89b
parenteb38cf2d7a7957b49f8ed53d1424900112b36e4a
Merge branch 'MDL-30132_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE