Merge branch 'MDL-36608_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:24:10 +0000 (14:24 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:24:10 +0000 (14:24 +1300)
commit15e9d4c64a5f4a61a47e0faa6b6ee5fa898f2d66
tree49523a44ea1422df4d6b1ca56b439a070f8fecb4
parentb35e30e5bcc939e966b92df13402852de6d13df4
parenta94316030f5c8c27dd316ee0d0024101ffdffdd3
Merge branch 'MDL-36608_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE