Merge branch 'MDL-36760_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
commit4c14127cdbeb97c1cf3f4d45f925616638b97c85
authorSam Hemelryk <sam@moodle.com>
Mon, 26 Nov 2012 21:40:57 +0000 (27 10:40 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 26 Nov 2012 21:40:57 +0000 (27 10:40 +1300)
treee48b8a5474c84ac2a230c18831bd111e2b3d25e9
parent55f8a9c7666230fe27362e38a8ed59c8771bd37a
parent500c73ba1ec5c6045761a77c4498d1dfe9e79a42
Merge branch 'MDL-36760_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE