Merge branch 'MDL-52879_29' of git://github.com/timhunt/moodle into MOODLE_29_STABLE
commitcdd4d84eda7df90627fb0005d345ced191160c47
authorDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 10:26:02 +0000 (16 10:26 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 10:26:02 +0000 (16 10:26 +0000)
tree051720f7a97618f53f83f5fe08042532d3b47baf
parent6d7a12e085f8b6b79371eaf8d0ce8a1ddce06c7b
parent93ea68f50d5ea7a75c2a6c4f1e26e15dc4d56c00
Merge branch 'MDL-52879_29' of git://github.com/timhunt/moodle into MOODLE_29_STABLE