Merge branch 'MDL-48655-27' of git://github.com/merrill-oakland/moodle into MOODLE_27...
commitb21d1db3c3b2ac9a48a01bc65d25718fa65fea93
authorDan Poltawski <dan@moodle.com>
Tue, 6 Jan 2015 11:09:44 +0000 (6 11:09 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Jan 2015 11:09:44 +0000 (6 11:09 +0000)
treed3b153ccdbbc937a6d5a44826588f7cc99af4fc7
parentb82b4c562b705ea8f11893d9126889bb696b9612
parentab391cddf0aaa968e2aaa13083405dafe026d2fb
Merge branch 'MDL-48655-27' of git://github.com/merrill-oakland/moodle into MOODLE_27_STABLE