Merge branch 'MDL-36076_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Oct 2012 23:59:12 +0000 (12:59 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Oct 2012 23:59:12 +0000 (12:59 +1300)
commit1d6d520a5a266651414c3e9043cfae70b7566f05
tree61e859e53b0f7a0cf1f915586ce3d0466c699e8a
parent41db2a5afc47e12cb1dc9157918201ad0aa476cb
parentdb05d5953493cf9b1a3bff717acdd65a237c9397
Merge branch 'MDL-36076_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE